add Money support to mssql, extract shared code to decimal_tools and write test code

Author: c5soft

Cargo.toml

@@ -27,7 +27,7 @@ repository = "https://github.com/lovasoa/sqlx"
 documentation = "https://docs.rs/sqlx"
 description = "🧰 The Rust SQL Toolkit. An async, pure Rust SQL crate featuring compile-time checked queries without a DSL. Supports PostgreSQL, MySQL, and SQLite."
 edition = "2021"
-keywords = ["database", "async", "postgres", "mysql", "sqlite"]
+keywords = ["database", "async", "postgres", "mysql", "sqlite", "mssql"]
 categories = ["database", "asynchronous"]
 authors = [
     "Ryan Leckey <[email protected]>",
@@ -126,7 +126,7 @@ bstr = ["sqlx-core/bstr"]
 git2 = ["sqlx-core/git2"]
 
 [dependencies]
-sqlx-core = { package = "sqlx-core-oldapi",  version = "0.6.42", path = "sqlx-core", default-features = false }
+sqlx-core = { package = "sqlx-core-oldapi", version = "0.6.42", path = "sqlx-core", default-features = false }
 sqlx-macros = { package = "sqlx-macros-oldapi", version = "0.6.42", path = "sqlx-macros", default-features = false, optional = true }
 
 [dev-dependencies]
@@ -149,7 +149,9 @@ rand_xoshiro = "0.7.0"
 hex = "0.4.3"
 tempdir = "0.3.7"
 # Needed to test SQLCipher
-libsqlite3-sys = { version = "0", features = ["bundled-sqlcipher-vendored-openssl"] }
+libsqlite3-sys = { version = "0", features = [
+    "bundled-sqlcipher-vendored-openssl",
+] }
 
 
 [lints.rust]

sqlx-core/src/mssql/options/parse.rs

@@ -143,15 +143,15 @@ impl std::error::Error for MssqlInvalidOption {}
 
 #[test]
 fn it_parses_username_with_at_sign_correctly() {
-    let url = "mysql://user@hostname:password@hostname:5432/database";
+    let url = "mssql://user@hostname:password@hostname:5432/database";
     let opts = MssqlConnectOptions::from_str(url).unwrap();
 
     assert_eq!("user@hostname", &opts.username);
 }
 
 #[test]
 fn it_parses_password_with_non_ascii_chars_correctly() {
-    let url = "mysql://username:p@ssw0rd@hostname:5432/database";
+    let url = "mssql://username:p@ssw0rd@hostname:5432/database";
     let opts = MssqlConnectOptions::from_str(url).unwrap();
 
     assert_eq!(Some("p@ssw0rd".into()), opts.password);

sqlx-core/src/mssql/types/decimal_tools.rs

@@ -41,11 +41,7 @@ mod tests {
     use super::*;
     use std::error::Error;
 
-    fn err_of(msg: &str) -> String {
-        format!("encountered unexpected or invalid data: {}", msg)
-    }
-
-    // ========== decode_money_bytes  ==========
+    // ========== test decode_money_bytes  ==========
 
     #[test]
     fn test_decode_money_bytes_empty() {
@@ -54,7 +50,7 @@ mod tests {
         assert!(result.is_err());
         assert_eq!(
             result.unwrap_err().to_string(),
-            err_of("expected 8/4 bytes for Money, got 0")
+            err_protocol!("expected 8/4 bytes for Money, got {}", bytes.len()).to_string()
         );
     }
 
@@ -65,7 +61,7 @@ mod tests {
         assert!(result.is_err());
         assert_eq!(
             result.unwrap_err().to_string(),
-            err_of("expected 8/4 bytes for Money, got 3")
+            err_protocol!("expected 8/4 bytes for Money, got {}", bytes.len()).to_string()
         );
     }
 
@@ -118,7 +114,7 @@ mod tests {
         assert_eq!(amount, 0);
     }
 
-    // ========== decode_numeric_bytes  ==========
+    // ========== test decode_numeric_bytes  ==========
 
     #[test]
     fn test_decode_numeric_bytes_empty() {
@@ -127,7 +123,7 @@ mod tests {
         assert!(result.is_err());
         assert_eq!(
             result.unwrap_err().to_string(),
-            err_of("numeric bytes cannot be empty")
+            err_protocol!("numeric bytes cannot be empty").to_string()
         );
     }
 
@@ -138,7 +134,7 @@ mod tests {
         assert!(result.is_err());
         assert_eq!(
             result.unwrap_err().to_string(),
-            err_of("invalid sign byte: 0x02")
+            err_protocol!("invalid sign byte: 0x02").to_string()
         );
     }
 
@@ -149,7 +145,7 @@ mod tests {
         assert!(result.is_err());
         assert_eq!(
             result.unwrap_err().to_string(),
-            err_of("numeric value exceeds 16 bytes")
+            err_protocol!("numeric value exceeds 16 bytes").to_string()
         );
     }
 

sqlx-macros/src/lib.rs

@@ -1,6 +1,11 @@
 #![allow(clippy::large_enum_variant)]
 #![cfg_attr(
-    not(any(feature = "postgres", feature = "mysql", feature = "offline")),
+    not(any(
+        feature = "postgres",
+        feature = "mysql",
+        feature = "mssql",
+        feature = "offline"
+    )),
     allow(dead_code, unused_macros, unused_imports)
 )]
 #![cfg_attr(

tests/mssql/types.rs

@@ -67,10 +67,9 @@ test_type!(numeric<f64>(Mssql,
     "CAST(0.0000000000000001 AS NUMERIC(38,16))" == 0.0000000000000001_f64,
     "CAST(939399419.1225182 AS NUMERIC(15,2))" == 939399419.12_f64,
     "CAST(939399419.1225182 AS DECIMAL(15,2))" == 939399419.12_f64,
-    "CAST(123456789.0123456789 AS NUMERIC(38,10))" == 123_456_789.012_345_67_f64,
-    "CAST(123456789.0123456789012 AS NUMERIC(38,13))" == 123_456_789.012_345_67_f64,
-    "CAST(123456789.012345678901234 AS NUMERIC(38,15))" == 123_456_789.012_345_67_f64,
-
+    "CAST(123456789.0123456789 AS NUMERIC(38,10))" == 123_456_789.012_345_678_9_f64,
+    "CAST(123456789.0123456789012 AS NUMERIC(38,13))" == 123_456_789.012_345_678_901_2_f64,
+    "CAST(123456789.012345678901234 AS NUMERIC(38,15))" == 123_456_789.012_345_678_901_234_f64,
     "CAST(1.0000000000000001 AS NUMERIC(18,16))" == 1.0000000000000001_f64,
     "CAST(0.99999999999999 AS NUMERIC(18,14))" == 0.99999999999999_f64,
     "CAST(2.00000000000001 AS NUMERIC(18,14))" == 2.00000000000001_f64,
@@ -184,6 +183,8 @@ mod decimal {
             == Decimal::from_str_exact("0.01234567890123456789").unwrap(),
         "CAST('-12345678901234' AS DECIMAL(28,5))"
             == Decimal::from_str_exact("-12345678901234").unwrap(),
+        "CAST('-1234567890.1234' AS MONEY)" == Decimal::from_str_exact("-1234567890.1234").unwrap(),
+        "CAST('-123456.1234' AS SMALLMONEY)" == Decimal::from_str_exact("-123456.1234").unwrap(),
     ));
 }
 
@@ -204,6 +205,8 @@ mod bigdecimal {
             == BigDecimal::from_str("-12345678901234567890").unwrap(),
         "CAST('-12345678901234567890.012345678901234' AS DECIMAL(38,15))"
             == BigDecimal::from_str("-12345678901234567890.012345678901234").unwrap(),
+        "CAST('-1234567890.1234' AS MONEY)" == BigDecimal::from_str("-1234567890.1234").unwrap(),
+        "CAST('-123456.1234' AS SMALLMONEY)" == BigDecimal::from_str("-123456.1234").unwrap(),
     ));
 }