Skip to content

Commit 21282aa

Browse files
authored
cargo: use neon branch of rust-postgres (#9757)
## Problem We are pining our fork of rust-postgres to a commit hash and that prevents us from making further changes to it. The latest commit in rust-postgres requires #8747, but that seems to have gone stale. I reverted rust-postgres `neon` branch to the pinned commit in neondatabase/rust-postgres#31. ## Summary of changes Switch back to using the `neon` branch of the rust-postgres fork.
1 parent d06bf4b commit 21282aa

File tree

3 files changed

+11
-22
lines changed

3 files changed

+11
-22
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -203,21 +203,10 @@ env_logger = "0.10"
203203
log = "0.4"
204204

205205
## Libraries from neondatabase/ git forks, ideally with changes to be upstreamed
206-
207-
# We want to use the 'neon' branch for these, but there's currently one
208-
# incompatible change on the branch. See:
209-
#
210-
# - PR #8076 which contained changes that depended on the new changes in
211-
# the rust-postgres crate, and
212-
# - PR #8654 which reverted those changes and made the code in proxy incompatible
213-
# with the tip of the 'neon' branch again.
214-
#
215-
# When those proxy changes are re-applied (see PR #8747), we can switch using
216-
# the tip of the 'neon' branch again.
217-
postgres = { git = "https://github.com/neondatabase/rust-postgres.git", rev = "20031d7a9ee1addeae6e0968e3899ae6bf01cee2" }
218-
postgres-protocol = { git = "https://github.com/neondatabase/rust-postgres.git", rev = "20031d7a9ee1addeae6e0968e3899ae6bf01cee2" }
219-
postgres-types = { git = "https://github.com/neondatabase/rust-postgres.git", rev = "20031d7a9ee1addeae6e0968e3899ae6bf01cee2" }
220-
tokio-postgres = { git = "https://github.com/neondatabase/rust-postgres.git", rev = "20031d7a9ee1addeae6e0968e3899ae6bf01cee2" }
206+
postgres = { git = "https://github.com/neondatabase/rust-postgres.git", branch = "neon" }
207+
postgres-protocol = { git = "https://github.com/neondatabase/rust-postgres.git", branch = "neon" }
208+
postgres-types = { git = "https://github.com/neondatabase/rust-postgres.git", branch = "neon" }
209+
tokio-postgres = { git = "https://github.com/neondatabase/rust-postgres.git", branch = "neon" }
221210

222211
## Local libraries
223212
compute_api = { version = "0.1", path = "./libs/compute_api/" }
@@ -255,7 +244,7 @@ tonic-build = "0.12"
255244
[patch.crates-io]
256245

257246
# Needed to get `tokio-postgres-rustls` to depend on our fork.
258-
tokio-postgres = { git = "https://github.com/neondatabase/rust-postgres.git", rev = "20031d7a9ee1addeae6e0968e3899ae6bf01cee2" }
247+
tokio-postgres = { git = "https://github.com/neondatabase/rust-postgres.git", branch = "neon" }
259248

260249
################# Binary contents sections
261250

workspace_hack/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ num-integer = { version = "0.1", features = ["i128"] }
5858
num-traits = { version = "0.2", features = ["i128", "libm"] }
5959
once_cell = { version = "1" }
6060
parquet = { version = "53", default-features = false, features = ["zstd"] }
61-
postgres-types = { git = "https://github.com/neondatabase/rust-postgres.git", rev = "20031d7a9ee1addeae6e0968e3899ae6bf01cee2", default-features = false, features = ["with-serde_json-1"] }
61+
postgres-types = { git = "https://github.com/neondatabase/rust-postgres.git", branch = "neon", default-features = false, features = ["with-serde_json-1"] }
6262
prost = { version = "0.13", features = ["prost-derive"] }
6363
rand = { version = "0.8", features = ["small_rng"] }
6464
regex = { version = "1" }
@@ -78,7 +78,7 @@ sync_wrapper = { version = "0.1", default-features = false, features = ["futures
7878
tikv-jemalloc-sys = { version = "0.5" }
7979
time = { version = "0.3", features = ["macros", "serde-well-known"] }
8080
tokio = { version = "1", features = ["fs", "io-std", "io-util", "macros", "net", "process", "rt-multi-thread", "signal", "test-util"] }
81-
tokio-postgres = { git = "https://github.com/neondatabase/rust-postgres.git", rev = "20031d7a9ee1addeae6e0968e3899ae6bf01cee2", features = ["with-serde_json-1"] }
81+
tokio-postgres = { git = "https://github.com/neondatabase/rust-postgres.git", branch = "neon", features = ["with-serde_json-1"] }
8282
tokio-rustls = { version = "0.26", default-features = false, features = ["logging", "ring", "tls12"] }
8383
tokio-stream = { version = "0.1", features = ["net"] }
8484
tokio-util = { version = "0.7", features = ["codec", "compat", "io", "rt"] }

0 commit comments

Comments
 (0)