Fix ODBC fixed-size parameter indicators

Author: lovasoa

sqlx-core/src/odbc/connection/mod.rs

@@ -303,6 +303,12 @@ impl OdbcConnection {
         })
         .await?;
 
+        if !allow_deferred_result_columns && !metadata_complete {
+            return Err(Error::Protocol(
+                "ODBC driver did not provide result-column metadata before execution".into(),
+            ));
+        }
+
         if store_to_cache && metadata_complete && self.stmt_cache.is_enabled() {
             self.stmt_cache
                 .insert(&sql_owned, Arc::new(Mutex::new(prepared)));

sqlx-core/src/odbc/connection/odbc_bridge.rs

@@ -131,34 +131,34 @@ fn to_param(arg: OdbcArgumentValue) -> Box<dyn odbc_api::parameter::InputParamet
     use odbc_api::DataType;
 
     match arg {
-        OdbcArgumentValue::Int(i) => Box::new(i.into_parameter()),
+        OdbcArgumentValue::Int(i) => Box::new(Some(i).into_parameter()),
         OdbcArgumentValue::UInt(u) => Box::new(
             WithDataType {
-                value: u,
+                value: odbc_api::Nullable::new(u),
                 data_type: DataType::BigInt,
             }
             .into_parameter(),
         ),
-        OdbcArgumentValue::Float(f) => Box::new(f.into_parameter()),
+        OdbcArgumentValue::Float(f) => Box::new(Some(f).into_parameter()),
         OdbcArgumentValue::Text(s) => Box::new(s.into_parameter()),
         OdbcArgumentValue::Bytes(b) => Box::new(b.into_parameter()),
         OdbcArgumentValue::Date(d) => Box::new(
             WithDataType {
-                value: d,
+                value: odbc_api::Nullable::new(d),
                 data_type: DataType::Date,
             }
             .into_parameter(),
         ),
         OdbcArgumentValue::Time(t) => Box::new(
             WithDataType {
-                value: t,
+                value: odbc_api::Nullable::new(t),
                 data_type: DataType::Time { precision: 0 },
             }
             .into_parameter(),
         ),
         OdbcArgumentValue::Timestamp(ts) => Box::new(
             WithDataType {
-                value: ts,
+                value: odbc_api::Nullable::new(ts),
                 data_type: DataType::Timestamp { precision: 6 },
             }
             .into_parameter(),
@@ -177,7 +177,7 @@ fn to_param(arg: OdbcArgumentValue) -> Box<dyn odbc_api::parameter::InputParamet
 mod tests {
     use super::*;
     use crate::arguments::Arguments;
-    use odbc_api::handles::HasDataType;
+    use odbc_api::handles::{CData, HasDataType};
 
     #[test]
     fn typed_none_parameter_preserves_non_string_data_type() {
@@ -189,6 +189,17 @@ mod tests {
         assert_eq!(params.len(), 1);
         assert_eq!(params[0].data_type(), odbc_api::DataType::Integer);
     }
+
+    #[test]
+    fn fixed_sized_parameter_uses_explicit_non_null_indicator() {
+        let mut args = OdbcArguments::default();
+
+        args.add(5_i32);
+
+        let params = prepare_parameters(Some(args));
+        assert_eq!(params.len(), 1);
+        assert!(!params[0].indicator_ptr().is_null());
+    }
 }
 
 fn handle_result_sets<C: Cursor + ResultSetMetadata>(

tests/odbc/odbc.rs

@@ -650,7 +650,14 @@ where
         let mut opts = OdbcConnectOptions::from_str(&database_url)?;
         opts.buffer_settings(buf_settings);
 
-        let conn = OdbcConnection::connect_with(&opts).await?;
+        let mut conn = OdbcConnection::connect_with(&opts).await?;
+        let dbms_name = conn.dbms_name().await?;
+        if buf_settings.max_column_size.is_some()
+            && dbms_name.to_ascii_lowercase().contains("duckdb")
+        {
+            // DuckDB's ODBC driver rejects the rowset attributes used by buffered fetching.
+            continue;
+        }
         test_fn(conn, buf_settings).await?;
     }
     Ok(())
@@ -1385,7 +1392,8 @@ async fn it_handles_prepared_statement_with_wrong_parameter_count() -> anyhow::R
     assert!(
         err_str.contains("07002")
             || err_str.contains("parameter count")
-            || err_str.contains("unbound parameter"),
+            || err_str.contains("unbound parameter")
+            || err_str.contains("not all parameters are bound"),
         "{:?} should contain '07002' (COUNT field incorrect)",
         err
     );