Merge pull request #52 from Intreecom/bugfix/floats

Author: s3rius

.github/workflows/test.yaml

@@ -64,7 +64,7 @@ jobs:
           - 9042:9042
     strategy:
       matrix:
-        py_version: ["3.8", "3.9", "3.10", "3.11"]
+        py_version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
         job:
             - os: ubuntu-latest
               ssl_cmd: sudo apt-get update && sudo apt-get install libssl-dev openssl

.python-version

@@ -1,3 +1,4 @@
+3.12.2
 3.11.4
 3.10.12
 3.9.17

python/tests/test_bindings.py

@@ -108,6 +108,23 @@ async def test_named_parameters(scylla: Scylla) -> None:
     assert res.first() == to_insert
 
 
+@pytest.mark.anyio
+async def test_floats(scylla: Scylla) -> None:
+    table_name = random_string(4)
+    my_float = 1.234
+    await scylla.execute(
+        f"CREATE TABLE {table_name} (id INT, fl FLOAT, PRIMARY KEY (id))",
+    )
+    insert_query = f"INSERT INTO {table_name}(id, fl) VALUES (?, ?)"
+
+    await scylla.execute(insert_query, [1, my_float])
+
+    res = await scylla.execute(f"SELECT fl FROM {table_name}")
+    scalar = res.scalar()
+    assert scalar
+    assert abs(scalar - my_float) < 0.001
+
+
 @pytest.mark.anyio
 async def test_timestamps(scylla: Scylla) -> None:
     table_name = random_string(4)

src/query_builder/update.rs

@@ -1,3 +1,5 @@
+use std::fmt::Display;
+
 use pyo3::{pyclass, pymethods, types::PyDict, PyAny, PyRefMut, Python};
 use scylla::{frame::value::LegacySerializedValues, query::Query};
 
@@ -17,12 +19,12 @@ enum UpdateAssignment {
     Dec(String, String),
 }
 
-impl ToString for UpdateAssignment {
-    fn to_string(&self) -> String {
+impl Display for UpdateAssignment {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            UpdateAssignment::Simple(name) => format!("{name} = ?"),
-            UpdateAssignment::Inc(left, right) => format!("{left} = {right} + ?"),
-            UpdateAssignment::Dec(left, right) => format!("{left} = {right} - ?"),
+            UpdateAssignment::Simple(name) => f.write_fmt(format_args!("{name} = ?")),
+            UpdateAssignment::Inc(left, right) => f.write_fmt(format_args!("{left} = {right} + ?")),
+            UpdateAssignment::Dec(left, right) => f.write_fmt(format_args!("{left} = {right} - ?")),
         }
     }
 }

src/utils.rs

@@ -369,7 +369,7 @@ pub fn cql_to_py<'a>(
             .ok_or(ScyllaPyError::ValueDowncastError(col_name.into(), "Double"))
             .map(|val| val.to_object(py).into_ref(py)),
         ColumnType::Float => unwrapped_value
-            .as_double()
+            .as_float()
             .ok_or(ScyllaPyError::ValueDowncastError(col_name.into(), "Float"))
             .map(|val| val.to_object(py).into_ref(py)),
         ColumnType::Int => unwrapped_value

tox.ini

@@ -1,13 +1,15 @@
 [tox]
 isolated_build = true
 env_list =
+    py312
     py311
     py310
     py39
     py38
 
 [gh]
 python =
+    3.12 = py312
     3.11 = py311
     3.10 = py310
     3.9  = py39