Skip to content

Commit 4d0ccdd

Browse files
committed
Auto-commit pending changes before rebase - PR synchronize
1 parent f704cd8 commit 4d0ccdd

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

.github/workflows/sqlx.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -373,11 +373,18 @@ jobs:
373373
-- -D warnings
374374
- name: Run ODBC tests (PostgreSQL DSN)
375375
run: |
376-
cargo test --no-default-features --features any,odbc,macros,all-types,runtime-tokio-rustls -- --test odbc
376+
cargo test --no-default-features --features any,odbc,macros,all-types,runtime-tokio-rustls -- --test any-odbc
377+
cargo test --no-default-features --features odbc,all-types,runtime-tokio-rustls -- --test odbc
378+
cargo test --no-default-features --features odbc,all-types,runtime-tokio-rustls -- --test odbc-types
377379
env:
378380
DATABASE_URL: DSN=SQLX_PG_5432;UID=postgres;PWD=password
379381
- name: Run ODBC tests (SQLite driver)
380382
run: |
381-
cargo test --no-default-features --features any,odbc,macros,all-types,runtime-tokio-rustls -- --test odbc
383+
set -e
384+
if odbcinst -q -d | grep -q '^\[SQLite3\]'; then SQLITE_DRIVER=SQLite3; elif odbcinst -q -d | grep -q '^\[SQLite\]'; then SQLITE_DRIVER=SQLite; else echo 'No SQLite ODBC driver installed'; exit 1; fi
385+
echo "Using SQLite ODBC driver: ${SQLITE_DRIVER}"
386+
cargo test --no-default-features --features any,odbc,macros,all-types,runtime-tokio-rustls -- --test any-odbc
387+
cargo test --no-default-features --features odbc,all-types,runtime-tokio-rustls -- --test odbc
388+
cargo test --no-default-features --features odbc,all-types,runtime-tokio-rustls -- --test odbc-types
382389
env:
383-
DATABASE_URL: Driver={SQLite3 ODBC Driver};Database=./tests/odbc/sqlite.db
390+
DATABASE_URL: Driver={${{ env.SQLITE_DRIVER }}};Database=./tests/odbc/sqlite.db

0 commit comments

Comments
 (0)