Fix odbc column name type mismatch (#42)

* Fix: Decode column names using UTF-16

Co-authored-by: contact <[email protected]>

* Checkpoint before follow-up message

Co-authored-by: contact <[email protected]>

* Checkpoint before follow-up message

Co-authored-by: contact <[email protected]>

* Fix: Remove unused linter directive

Co-authored-by: contact <[email protected]>

* Fix: Update CI and odbc bridge path

Co-authored-by: contact <[email protected]>

* Enhance CI configuration for unit tests by adding OS matrix support and removing the Windows build job

* Refactor: Remove redundant comment about decode_column_name in odbc_bridge.rs

* Fix: Normalize SQLite test paths to use forward slashes

Co-authored-by: contact <[email protected]>

* Fix: Normalize error message case in prepare statement test

* Fix: Correct string replacement syntax for path normalization in SQLite tests

---------

Co-authored-by: Cursor Agent <[email protected]>

Author: lovasoa

.github/workflows/sqlx.yml

@@ -48,15 +48,19 @@ jobs:
             -- -D warnings
 
   test:
-    name: Unit Test
-    runs-on: ubuntu-24.04
+    name: Unit Test ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
       - uses: Swatinem/rust-cache@v2
         with:
           prefix-key: v1-sqlx
           save-if: ${{ false }}
       - run: sudo apt-get update && sudo apt-get install -y libodbc2 unixodbc-dev
+        if: ${{ matrix.os == 'ubuntu-latest' }}
       - run: cargo test
           --manifest-path sqlx-core/Cargo.toml
           --features offline,all-databases,all-types,runtime-tokio-rustls

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

@@ -40,8 +40,24 @@ fn create_column(stmt: &mut PreparedStatement, index: u16) -> OdbcColumn {
     }
 }
 
-fn decode_column_name(name_bytes: Vec<u8>, index: u16) -> String {
-    String::from_utf8(name_bytes).unwrap_or_else(|_| format!("col{}", index - 1))
+pub(super) trait ColumnNameDecode {
+    fn decode_or_default(self, index: u16) -> String;
+}
+
+impl ColumnNameDecode for Vec<u8> {
+    fn decode_or_default(self, index: u16) -> String {
+        String::from_utf8(self).unwrap_or_else(|_| format!("col{}", index - 1))
+    }
+}
+
+impl ColumnNameDecode for Vec<u16> {
+    fn decode_or_default(self, index: u16) -> String {
+        String::from_utf16(&self).unwrap_or_else(|_| format!("col{}", index - 1))
+    }
+}
+
+pub(super) fn decode_column_name<T: ColumnNameDecode>(name: T, index: u16) -> String {
+    name.decode_or_default(index)
 }
 
 /// A connection to an ODBC-accessible database.

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

@@ -1,3 +1,4 @@
+use super::decode_column_name;
 use crate::error::Error;
 use crate::odbc::{
     connection::MaybePrepared, OdbcArgumentValue, OdbcArguments, OdbcColumn, OdbcQueryResult,
@@ -139,10 +140,6 @@ where
     }
 }
 
-fn decode_column_name(name_bytes: Vec<u8>, index: u16) -> String {
-    String::from_utf8(name_bytes).unwrap_or_else(|_| format!("col{}", index - 1))
-}
-
 fn stream_rows<C>(cursor: &mut C, columns: &[OdbcColumn], tx: &ExecuteSender) -> Result<bool, Error>
 where
     C: Cursor,

sqlx-core/src/sqlite/testing/mod.rs

@@ -68,9 +68,11 @@ fn convert_path(test_path: &str) -> String {
 
     path.set_extension("sqlite");
 
-    path.into_os_string()
+    let s = path
+        .into_os_string()
         .into_string()
-        .expect("path should be UTF-8")
+        .expect("path should be UTF-8");
+    s.replace("\\", "/")
 }
 
 #[test]

tests/odbc/odbc.rs

@@ -794,7 +794,7 @@ async fn it_handles_prepare_statement_errors() -> anyhow::Result<()> {
         },
         Err(sqlx_oldapi::Error::Database(err)) => {
             assert!(
-                err.to_string().contains("idonotexist"),
+                err.to_string().to_lowercase().contains("idonotexist"),
                 "{:?} should contain 'idonotexist'",
                 err
             );