Add support for decoding all numeric types as either f32 or f64 in mssql

sqlpage · Nov 2, 2024 · bbb69eb · bbb69eb
1 parent 8f30800
commit bbb69eb
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.6.33
+
+- Add support for decoding all numeric types as either f32 or f64 in mssql.
+
 ## 0.6.32
 - Make `AnyTypeInfoKind` public
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,7 +20,7 @@ members = [
 
 [package]
 name = "sqlx-oldapi"
-version = "0.6.32"
+version = "0.6.33"
 license = "MIT OR Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/lovasoa/sqlx"
@@ -125,8 +125,8 @@ bstr = ["sqlx-core/bstr"]
 git2 = ["sqlx-core/git2"]
 
 [dependencies]
-sqlx-core = { package = "sqlx-core-oldapi",  version = "0.6.32", path = "sqlx-core", default-features = false }
-sqlx-macros = { package = "sqlx-macros-oldapi", version = "0.6.32", path = "sqlx-macros", default-features = false, optional = true }
+sqlx-core = { package = "sqlx-core-oldapi",  version = "0.6.33", path = "sqlx-core", default-features = false }
+sqlx-macros = { package = "sqlx-macros-oldapi", version = "0.6.33", path = "sqlx-macros", default-features = false, optional = true }
 
 [dev-dependencies]
 anyhow = "1.0.52"

diff --git a/examples/postgres/axum-social-with-tests/Cargo.toml b/examples/postgres/axum-social-with-tests/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 # Primary crates
 axum = { version = "0.5.13", features = ["macros"] }
-sqlx = { package = "sqlx-oldapi",  version = "0.6.32", path = "../../../", features = ["runtime-tokio-rustls", "postgres", "time", "uuid"] }
+sqlx = { package = "sqlx-oldapi",  version = "0.6.33", path = "../../../", features = ["runtime-tokio-rustls", "postgres", "time", "uuid"] }
 tokio = { version = "1.20.1", features = ["rt-multi-thread", "macros"] }
 
 # Important secondary crates

diff --git a/sqlx-cli/Cargo.toml b/sqlx-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sqlx-cli"
-version = "0.6.32"
+version = "0.6.33"
 description = "Command-line utility for SQLx, the Rust SQL toolkit."
 edition = "2021"
 readme = "README.md"

diff --git a/sqlx-core/Cargo.toml b/sqlx-core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sqlx-core-oldapi"
-version = "0.6.32"
+version = "0.6.33"
 repository = "https://github.com/lovasoa/sqlx"
 description = "Core of SQLx, the rust SQL toolkit. Not intended to be used directly."
 license = "MIT OR Apache-2.0"
@@ -101,7 +101,7 @@ offline = ["serde", "either/serde"]
 paste = "1.0.6"
 ahash = "0.8.3"
 atoi = "2.0.0"
-sqlx-rt = { path = "../sqlx-rt", version = "0.6.32", package = "sqlx-rt-oldapi" }
+sqlx-rt = { path = "../sqlx-rt", version = "0.6.33", package = "sqlx-rt-oldapi" }
 base64 = { version = "0.22", default-features = false, optional = true, features = ["std"] }
 bigdecimal_ = { version = "0.4.1", optional = true, package = "bigdecimal" }
 rust_decimal = { version = "1.19.0", optional = true }

diff --git a/sqlx-core/src/mssql/types/float.rs b/sqlx-core/src/mssql/types/float.rs
@@ -27,7 +27,8 @@ impl Encode<'_, Mssql> for f32 {
 
 impl Decode<'_, Mssql> for f32 {
     fn decode(value: MssqlValueRef<'_>) -> Result<Self, BoxDynError> {
-        Ok(LittleEndian::read_f32(value.as_bytes()?))
+        let as_f64 = <f64 as Decode<'_, Mssql>>::decode(value)?;
+        Ok(as_f64 as f32)
     }
 }
 
@@ -67,6 +68,9 @@ impl Decode<'_, Mssql> for f64 {
             DataType::Float | DataType::FloatN if size == 8 => {
                 Ok(LittleEndian::read_f64(value.as_bytes()?))
             }
+            DataType::Float | DataType::FloatN if size == 4 => {
+                Ok(f64::from(LittleEndian::read_f32(value.as_bytes()?)))
+            }
             DataType::Numeric | DataType::NumericN | DataType::Decimal | DataType::DecimalN => {
                 decode_numeric(value.as_bytes()?, precision, scale)
             }

diff --git a/sqlx-macros/Cargo.toml b/sqlx-macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sqlx-macros-oldapi"
-version = "0.6.32"
+version = "0.6.33"
 repository = "https://github.com/lovasoa/sqlx"
 description = "Macros for SQLx, the rust SQL toolkit. Not intended to be used directly."
 license = "MIT OR Apache-2.0"
@@ -75,8 +75,8 @@ heck = { version = "0.5" }
 either = "1.6.1"
 once_cell = "1.9.0"
 proc-macro2 = { version = "1.0.36", default-features = false }
-sqlx-core = { package = "sqlx-core-oldapi",  version = "0.6.32", default-features = false, features = ["any"], path = "../sqlx-core" }
-sqlx-rt = { version = "0.6.32", default-features = false, path = "../sqlx-rt", package = "sqlx-rt-oldapi" }
+sqlx-core = { package = "sqlx-core-oldapi",  version = "0.6.33", default-features = false, features = ["any"], path = "../sqlx-core" }
+sqlx-rt = { version = "0.6.33", default-features = false, path = "../sqlx-rt", package = "sqlx-rt-oldapi" }
 serde = { version = "1.0.132", features = ["derive"], optional = true }
 serde_json = { version = "1.0.73", optional = true }
 sha2 = { version = "0.10.0", optional = true }

diff --git a/sqlx-rt/Cargo.toml b/sqlx-rt/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sqlx-rt-oldapi"
-version = "0.6.32"
+version = "0.6.33"
 repository = "https://github.com/launchbadge/sqlx"
 license = "MIT OR Apache-2.0"
 description = "Runtime abstraction used by SQLx, the Rust SQL toolkit. Not intended to be used directly."

diff --git a/tests/mssql/types.rs b/tests/mssql/types.rs
@@ -45,12 +45,14 @@ test_type!(i64(Mssql, "CAST(32324324432 AS BIGINT)" == 32324324432_i64));
 
 test_type!(f32(
     Mssql,
-    "CAST(3.14159265358979323846264338327950288 AS REAL)" == f32::consts::PI
+    "CAST(3.14159265358979323846264338327950288 AS REAL)" == f32::consts::PI,
+    "CAST(0.5 AS DECIMAL(3,2))" == 0.5_f32,
 ));
 
 test_type!(f64(
     Mssql,
-    "CAST(939399419.1225182 AS FLOAT)" == 939399419.1225182_f64
+    "CAST(939399419.1225182 AS FLOAT)" == 939399419.1225182_f64,
+    "CAST(9.75 AS REAL)" == 9.75_f64,
 ));
 
 test_type!(numeric<f64>(Mssql,