Merge pull request scylladb#1106 from Lorak-mmk/not-deserialize-count…

…er-to-i64 Deserialize: don't use i64 for Counter column
muzarski · Oct 25, 2024 · 0e0b754 · 0e0b754
2 parents 9aaf25a + 405064c
commit 0e0b754
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/scylla-cql/src/types/deserialize/row_tests.rs b/scylla-cql/src/types/deserialize/row_tests.rs
@@ -320,7 +320,7 @@ fn test_tuple_errors() {
         assert_matches!(
             &err.kind,
             super::super::value::BuiltinTypeCheckErrorKind::MismatchedType {
-                expected: &[ColumnType::BigInt, ColumnType::Counter]
+                expected: &[ColumnType::BigInt]
             }
         );
     }

diff --git a/scylla-cql/src/types/deserialize/value.rs b/scylla-cql/src/types/deserialize/value.rs
@@ -207,7 +207,7 @@ impl_emptiable_strict_type!(
 impl_fixed_numeric_type!(i8, TinyInt);
 impl_fixed_numeric_type!(i16, SmallInt);
 impl_fixed_numeric_type!(i32, Int);
-impl_fixed_numeric_type!(i64, [BigInt | Counter]);
+impl_fixed_numeric_type!(i64, BigInt);
 impl_fixed_numeric_type!(f32, Float);
 impl_fixed_numeric_type!(f64, Double);
 

diff --git a/scylla-cql/src/types/deserialize/value_tests.rs b/scylla-cql/src/types/deserialize/value_tests.rs
@@ -1284,7 +1284,7 @@ fn test_set_or_list_errors() {
         assert_matches!(
             err.kind,
             BuiltinTypeCheckErrorKind::MismatchedType {
-                expected: &[ColumnType::BigInt, ColumnType::Counter]
+                expected: &[ColumnType::BigInt]
             }
         );
     }
@@ -1363,7 +1363,7 @@ fn test_map_errors() {
         assert_matches!(
             err.kind,
             BuiltinTypeCheckErrorKind::MismatchedType {
-                expected: &[ColumnType::BigInt, ColumnType::Counter]
+                expected: &[ColumnType::BigInt]
             }
         );
     }
@@ -1527,7 +1527,7 @@ fn test_tuple_errors() {
             assert_matches!(
                 err.kind,
                 BuiltinTypeCheckErrorKind::MismatchedType {
-                    expected: &[ColumnType::BigInt, ColumnType::Counter]
+                    expected: &[ColumnType::BigInt]
                 }
             );
         }