WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit f13a5b5

Browse files
authored
Merge pull request #87 from palfrey/fix-odbc-features-list
Remove odbc feature now it's fixed
2 parents 6afc670 + d2de057 commit f13a5b5

File tree

4 files changed

+20
-14
lines changed

4 files changed

+20
-14
lines changed

Cargo.lock

Lines changed: 16 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ edition = "2018"
66
resolver = "2"
77

88
[dependencies]
9-
odbc-api = {version="20.0", default-features = false, features = ["odbc_version_3_80"] }
10-
odbc-sys = { version= "0.17", features=["static"], default-features = false}
9+
odbc-api = {version="20.1", default-features = false }
10+
odbc-sys = { version= "0.27", features=["vendored-unix-odbc"], default-features = false}
1111
env_logger = {version="0.10.0", default-features = false }
1212
clap = { version = "4.5.44", features = ["std", "cargo", "help", "usage"], default-features = false }
1313
exitcode = {version="1.1", default-features = false }

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,4 @@ On macOS:
6868
On Debian
6969

7070
5. `sudo apt-get install odbc-postgresql libsqliteodbc`
71-
6. ``ODBC_SYS_STATIC_PATH=/usr/lib/x86_64-linux-gnu/ POSTGRES_SERVER=localhost POSTGRES_USERNAME=postgres POSTGRES_PASSWORD= RUST_BACKTRACE=1 POSTGRES_DRIVER=/usr/lib/x86_64-linux-gnu/odbc/psqlodbca.so SQLITE_DRIVER=/usr/lib/x86_64-linux-gnu/odbc/libsqlite3odbc.so cargo test -- --nocapture``
71+
6. ``POSTGRES_SERVER=localhost POSTGRES_USERNAME=postgres POSTGRES_PASSWORD= RUST_BACKTRACE=1 POSTGRES_DRIVER=/usr/lib/x86_64-linux-gnu/odbc/psqlodbca.so SQLITE_DRIVER=/usr/lib/x86_64-linux-gnu/odbc/libsqlite3odbc.so cargo test -- --nocapture``

src/odbc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ mod test {
126126
if let DbErrorType::OdbcError { error } = err.error {
127127
let desc = format!("{}", error);
128128
assert!(
129-
desc.contains("Can't open lib 'foo' : file not found"),
129+
desc.contains("Can't open lib 'foo' : foo: cannot open shared object file: No such file or directory"),
130130
"{}",
131131
desc
132132
);

0 commit comments

Comments
 (0)