Skip to content

Commit d7b600a

Browse files
committed
Try fixing postgres versions
Signed-off-by: Moritz Hoffmann <mh@materialize.com>
1 parent 79cbed9 commit d7b600a

File tree

3 files changed

+42
-81
lines changed

3 files changed

+42
-81
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,10 @@ incremental = true
282282
# tend to get rewritten or disappear (e.g., because a PR is force pushed or gets
283283
# merged), after which point it becomes impossible to build that historical
284284
# version of Materialize.
285+
[patch."https://github.com/MaterializeInc/rust-postgres-array"]
286+
postgres-protocol = { git = "https://github.com/MaterializeInc/rust-postgres", rev = "548f00c4cbcf7bd714c29cfd2fea7685040c9987" }
287+
postgres-types = { git = "https://github.com/MaterializeInc/rust-postgres", rev = "548f00c4cbcf7bd714c29cfd2fea7685040c9987" }
288+
285289
[patch.crates-io]
286290
# Waiting on https://github.com/sfackler/rust-postgres/pull/752.
287291
postgres = { git = "https://github.com/MaterializeInc/rust-postgres", rev = "548f00c4cbcf7bd714c29cfd2fea7685040c9987" }

src/workspace-hack/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ parquet = { version = "53.3.0", default-features = false, features = ["arrow", "
9292
percent-encoding = { version = "2.3.1" }
9393
phf = { version = "0.11.1", features = ["uncased"] }
9494
phf_shared = { version = "0.11.1", features = ["uncased"] }
95-
postgres = { git = "https://github.com/MaterializeInc/rust-postgres", default-features = false, features = ["with-chrono-0_4"] }
96-
postgres-types = { git = "https://github.com/MaterializeInc/rust-postgres", default-features = false, features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
95+
postgres = { git = "https://github.com/MaterializeInc/rust-postgres", rev = "548f00c4cbcf7bd714c29cfd2fea7685040c9987", default-features = false, features = ["with-chrono-0_4"] }
96+
postgres-types = { git = "https://github.com/MaterializeInc/rust-postgres", rev = "548f00c4cbcf7bd714c29cfd2fea7685040c9987", default-features = false, features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
9797
predicates = { version = "2.1.4" }
9898
proc-macro2 = { version = "1.0.92", features = ["span-locations"] }
9999
prost = { version = "0.13.2", features = ["no-recursion-limit", "prost-derive"] }
@@ -122,7 +122,7 @@ syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.90", features = ["extra
122122
textwrap = { version = "0.16.1", default-features = false, features = ["terminal_size"] }
123123
time = { version = "0.3.17", features = ["macros", "quickcheck", "serde-well-known"] }
124124
tokio = { version = "1.38.0", features = ["full", "test-util", "tracing"] }
125-
tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres", features = ["serde", "with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
125+
tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres", rev = "548f00c4cbcf7bd714c29cfd2fea7685040c9987", features = ["serde", "with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
126126
tokio-stream = { version = "0.1.16", features = ["net", "sync"] }
127127
tokio-util = { version = "0.7.4", features = ["codec", "compat", "io", "time"] }
128128
toml_datetime = { version = "0.6.3", default-features = false, features = ["serde"] }
@@ -224,8 +224,8 @@ parquet = { version = "53.3.0", default-features = false, features = ["arrow", "
224224
percent-encoding = { version = "2.3.1" }
225225
phf = { version = "0.11.1", features = ["uncased"] }
226226
phf_shared = { version = "0.11.1", features = ["uncased"] }
227-
postgres = { git = "https://github.com/MaterializeInc/rust-postgres", default-features = false, features = ["with-chrono-0_4"] }
228-
postgres-types = { git = "https://github.com/MaterializeInc/rust-postgres", default-features = false, features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
227+
postgres = { git = "https://github.com/MaterializeInc/rust-postgres", rev = "548f00c4cbcf7bd714c29cfd2fea7685040c9987", default-features = false, features = ["with-chrono-0_4"] }
228+
postgres-types = { git = "https://github.com/MaterializeInc/rust-postgres", rev = "548f00c4cbcf7bd714c29cfd2fea7685040c9987", default-features = false, features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
229229
predicates = { version = "2.1.4" }
230230
proc-macro2 = { version = "1.0.92", features = ["span-locations"] }
231231
proptest-derive = { version = "0.5.1", default-features = false, features = ["boxed_union"] }
@@ -256,7 +256,7 @@ textwrap = { version = "0.16.1", default-features = false, features = ["terminal
256256
time = { version = "0.3.17", features = ["macros", "quickcheck", "serde-well-known"] }
257257
time-macros = { version = "0.2.6", default-features = false, features = ["formatting", "parsing", "serde"] }
258258
tokio = { version = "1.38.0", features = ["full", "test-util", "tracing"] }
259-
tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres", features = ["serde", "with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
259+
tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres", rev = "548f00c4cbcf7bd714c29cfd2fea7685040c9987", features = ["serde", "with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
260260
tokio-stream = { version = "0.1.16", features = ["net", "sync"] }
261261
tokio-util = { version = "0.7.4", features = ["codec", "compat", "io", "time"] }
262262
toml_datetime = { version = "0.6.3", default-features = false, features = ["serde"] }

0 commit comments

Comments
 (0)