fix: fix wierdly merged lines

gluesql · panarch · Apr 6, 2023 · Nov 26, 2022 · Nov 26, 2022 · Nov 26, 2022
commit 96e19f1af81287dcb2f2dc4dc274c761fb3a8639
diff --git a/core/src/data/key.rs b/core/src/data/key.rs
@@ -59,6 +59,9 @@ impl Ord for Key {
             (Key::I128(l), Key::I128(r)) => l.cmp(r),
             (Key::U8(l), Key::U8(r)) => l.cmp(r),
             (Key::U16(l), Key::U16(r)) => l.cmp(r),
+            (Key::U32(l),Key::U32(r))=> l.cmp(r),
+            (Key::U64(l),Key::U64(r))=> l.cmp(r),
+            (Key::U128(l),Key::U128(r))=> l.cmp(r),
             (Key::F64(l), Key::F64(r)) => l.total_cmp(&r.0),
             (Key::Decimal(l), Key::Decimal(r)) => l.cmp(r),
             (Key::Bool(l), Key::Bool(r)) => l.cmp(r),
@@ -81,6 +84,9 @@ impl Ord for Key {
             | (Key::I128(_), _)
             | (Key::U8(_), _)
             | (Key::U16(_), _)
+            | (Key::U32(_),_)
+            | (Key::U64(_),_)
+            | (Key::U128(_),_)    
             | (Key::F64(_), _)
             | (Key::Decimal(_), _)
             | (Key::Bool(_), _)
@@ -119,7 +125,7 @@ impl PartialOrd for Key {
             (Key::Interval(l), Key::Interval(r)) => l.partial_cmp(r),
             (Key::Uuid(l), Key::Uuid(r)) => Some(l.cmp(r)),
             _ => None,
-        }
+        };
         Some(self.cmp(other))
     }
 }

diff --git a/core/src/data/value/convert.rs b/core/src/data/value/convert.rs
@@ -697,11 +697,6 @@ mod tests {
     use {
         super::{ Value, ValueError},
         crate::{data::Interval as I, result::Result},
-        super::{Value, ValueError},
-        crate::{
-            data::{value::uuid::parse_uuid, Interval as I},
-            result::Result,
-        },
         chrono::{self, NaiveDate, NaiveDateTime, NaiveTime},
         rust_decimal::Decimal,
         std::{