feat(odbc): add Debug derive to OdbcValueRef and enhance UUID decoding logic

Author: lovasoa

sqlx-core/src/odbc/types/uuid.rs

@@ -38,12 +38,29 @@ impl<'r> Decode<'r, Odbc> for Uuid {
         if let Some(bytes) = value.blob {
             if bytes.len() == 16 {
                 return Ok(Uuid::from_bytes(bytes.try_into()?));
+            } else if bytes.len() == 128 {
+                // Each byte is ASCII '0' or '1' representing a bit
+                let mut uuid_bytes = [0u8; 16];
+                for (i, chunk) in bytes.chunks(8).enumerate() {
+                    if i >= 16 {
+                        break;
+                    }
+                    let mut byte_val = 0u8;
+                    for (j, &bit_byte) in chunk.iter().enumerate() {
+                        if bit_byte == 49 {
+                            // ASCII '1'
+                            byte_val |= 1 << (7 - j);
+                        }
+                    }
+                    uuid_bytes[i] = byte_val;
+                }
+                return Ok(Uuid::from_bytes(uuid_bytes));
             }
             // Some drivers may return UUIDs as ASCII/UTF-8 bytes
             let s = std::str::from_utf8(bytes)?.trim();
-            return Ok(Uuid::from_str(s)?);
+            return Ok(Uuid::from_str(s).map_err(|e| format!("Invalid UUID: {}, error: {}", s, e))?);
         }
         let s = <String as Decode<'r, Odbc>>::decode(value)?;
-        Ok(Uuid::from_str(s.trim())?)
+        Ok(Uuid::from_str(s.trim()).map_err(|e| format!("Invalid UUID: {}, error: {}", s, e))?)
     }
 }

sqlx-core/src/odbc/value.rs

@@ -2,6 +2,7 @@ use crate::odbc::{Odbc, OdbcTypeInfo};
 use crate::value::{Value, ValueRef};
 use std::borrow::Cow;
 
+#[derive(Debug)]
 pub struct OdbcValueRef<'r> {
     pub(crate) type_info: OdbcTypeInfo,
     pub(crate) is_null: bool,

tests/any/any.rs

@@ -140,7 +140,21 @@ async fn it_pings() -> anyhow::Result<()> {
 }
 
 #[sqlx_macros::test]
-async fn it_executes_with_pool() -> anyhow::Result<()> {
+async fn it_executes_one_statement_with_pool() -> anyhow::Result<()> {
+    let pool = sqlx_test::pool::<Any>().await?;
+
+    let rows = pool.fetch_all("SELECT 1").await?;
+
+    assert_eq!(rows.len(), 1);
+    assert_eq!(rows[0].try_get::<u16, _>(0)?, 1);
+
+    Ok(())
+}
+
+/// ODBC does not support multiple statements in a single query
+#[cfg(not(feature = "odbc"))]
+#[sqlx_macros::test]
+async fn it_executes_two_statements_with_pool() -> anyhow::Result<()> {
     let pool = sqlx_test::pool::<Any>().await?;
 
     let rows = pool.fetch_all("SELECT 1; SElECT 2").await?;