Skip to content

Commit d2be8d3

Browse files
committed
Change to upstream sqlx
* This has to carefully "unset or reject" non bypassable environment variable inference done by `sqlx::postgres::PgConnnectOptions` still its easier to maintain it that way than to maintain the fork. * See: launchbadge/sqlx#3832, launchbadge/sqlx#3983
1 parent 43a2c16 commit d2be8d3

File tree

7 files changed

+187
-165
lines changed

7 files changed

+187
-165
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@ resolver = "3"
44

55
[workspace.package]
66
edition = "2024"
7+
8+
[workspace.dependencies]
9+
sqlx = { version = "0.8.6", features = ["postgres", "runtime-tokio"] }

mmigration/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ log = "0.4.27"
1010
pg-client = { version = "0.0.1", path = "../pg-client" }
1111
regex-lite = "0.1.6"
1212
sha2 = "0.10.9"
13-
sqlx = { git = "https://github.com/mbj/sqlx", branch = "mbj/fork", features = ["postgres", "runtime-tokio"] }
13+
sqlx = { workspace = true }

pg-client/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ edition.workspace = true
66
[dependencies]
77
file-buf = { version = "0.0.1", path = "../file-buf" }
88
hostname-validator = "1.1.1"
9-
sqlx = { git = "https://github.com/mbj/sqlx", branch = "mbj/fork", features = ["postgres", "runtime-tokio"] }
9+
sqlx = { workspace = true }

0 commit comments

Comments
 (0)