Skip to content

Commit bb59e77

Browse files
petrosaggpetrosagg
committed
switch rust-postgres dependency to forked version
Needed until sfackler/rust-postgres#752 is merged and released Signed-off-by: Petros Angelatos <[email protected]>
1 parent d4208d6 commit bb59e77

File tree

19 files changed

+41
-44
lines changed

19 files changed

+41
-44
lines changed

‎Cargo.lock

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

‎demo/billing/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ hex = "0.4.3"
1717
log = "0.4.13"
1818
ore = { path = "../../src/ore" }
1919
parse_duration = "2.1.1"
20-
postgres-types = "0.2.0"
20+
postgres-types = { git = "https://github.com/MaterializeInc/rust-postgres" }
2121
protobuf = "2.17.0"
2222
rand = "0.8.3"
2323
rand_distr = "0.4.0"
2424
structopt = "0.3.21"
2525
test-util = { path = "../../test/test-util" }
2626
tokio = "1.4.0"
27-
tokio-postgres = "0.7.1"
27+
tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres" }
2828
uuid = { version = "0.8.2", features = ["v4"] }
2929

3030
[build-dependencies]

‎deny.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ unknown-git = "deny"
6262
unknown-registry = "deny"
6363
allow-git = [
6464
"https://github.com/MaterializeInc/pubnub-rust.git",
65+
# Until https://github.com/sfackler/rust-postgres/pull/752 is merged and released
66+
"https://github.com/MaterializeInc/rust-postgres.git",
67+
"https://github.com/MaterializeInc/rust-postgres-array.git",
6568
"https://github.com/MaterializeInc/rust-prometheus.git",
6669
"https://github.com/MaterializeInc/serde-protobuf.git",
6770
"https://github.com/TimelyDataflow/timely-dataflow",

‎src/coord/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ log = "0.4.13"
2828
mz-avro = { path = "../avro", features = ["snappy"] }
2929
ore = { path = "../ore" }
3030
pgrepr = { path = "../pgrepr" }
31-
postgres-types = "0.2.0"
31+
postgres-types = { git = "https://github.com/MaterializeInc/rust-postgres" }
3232
prometheus = { git = "https://github.com/MaterializeInc/rust-prometheus.git", default-features = false }
3333
rand = "0.8.3"
3434
rdkafka = { git = "https://github.com/fede1024/rust-rdkafka.git", features = ["cmake-build", "libz-static"] }
@@ -44,7 +44,7 @@ storage = { path = "../storage" }
4444
symbiosis = { path = "../symbiosis" }
4545
timely = { git = "https://github.com/TimelyDataflow/timely-dataflow", default-features = false, features = ["bincode"] }
4646
tokio = "1.4.0"
47-
tokio-postgres = "0.7.1"
47+
tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres" }
4848
tokio-stream = "0.1.5"
4949
transform = { path = "../transform" }
5050
unicase = "2.6.0"

‎src/materialized/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,15 @@ itertools = "0.9.0"
105105
kafka-util = { path = "../kafka-util" }
106106
pgrepr = { path = "../pgrepr" }
107107
pgtest = { path = "../pgtest" }
108-
postgres = { version = "0.19.0", features = ["with-chrono-0_4"] }
109-
postgres-openssl = "0.5.0"
110-
postgres-protocol = "0.6.1"
111-
postgres_array = "0.11.0"
108+
postgres = { git = "https://github.com/MaterializeInc/rust-postgres", features = ["with-chrono-0_4"] }
109+
postgres-openssl = { git = "https://github.com/MaterializeInc/rust-postgres" }
110+
postgres-protocol = { git = "https://github.com/MaterializeInc/rust-postgres" }
111+
postgres_array = { git = "https://github.com/MaterializeInc/rust-postgres-array" }
112112
predicates = "1.0.7"
113113
repr = { path = "../repr" }
114114
reqwest = { version = "0.11.2", features = ["blocking"] }
115115
serde_json = "1.0.64"
116-
tokio-postgres = { version = "0.7.1", features = ["with-chrono-0_4"] }
116+
tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres", features = ["with-chrono-0_4"] }
117117

118118
[build-dependencies]
119119
anyhow = "1.0.40"

‎src/peeker/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ log = "0.4.13"
1414
mz-process-collector = { path = "../mz-process-collector" }
1515
ore = { path = "../ore" }
1616
parse_duration = "2.1.1"
17-
postgres = "0.19.0"
17+
postgres = { git = "https://github.com/MaterializeInc/rust-postgres" }
1818
prometheus = { git = "https://github.com/MaterializeInc/rust-prometheus.git", default-features = false }
1919
regex = "1.4.5"
2020
serde = { version = "1.0.125", features = ["derive"] }

‎src/pgrepr/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ chrono = { version = "0.4.0", default-features = false, features = ["std"] }
1212
dec = "0.3.3"
1313
lazy_static = "1.4.0"
1414
ore = { path = "../ore" }
15-
postgres-types = { version = "0.2.0", features = ["with-chrono-0_4", "with-uuid-0_8"] }
15+
postgres-types = { git = "https://github.com/MaterializeInc/rust-postgres", features = ["with-chrono-0_4", "with-uuid-0_8"] }
1616
repr = { path = "../repr" }
1717
uuid = "0.8.2"

‎src/pgtest/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ bytes = "1.0.1"
1111
datadriven = "0.5.0"
1212
fallible-iterator = "0.2.0"
1313
ore = { path = "../ore" }
14-
postgres = "0.19.0"
15-
postgres-protocol = "0.6.1"
14+
postgres = { git = "https://github.com/MaterializeInc/rust-postgres" }
15+
postgres-protocol = { git = "https://github.com/MaterializeInc/rust-postgres" }
1616
serde = { version = "1.0.125", features = ["derive"] }
1717
serde_json = "1.0.64"
1818
structopt = "0.3.21"

‎src/pgwire/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ openssl = { version = "0.10.33", features = ["vendored"] }
2222
ordered-float = { version = "2.1.1", features = ["serde"] }
2323
ore = { path = "../ore" }
2424
pgrepr = { path = "../pgrepr" }
25-
postgres = "0.19.0"
25+
postgres = { git = "https://github.com/MaterializeInc/rust-postgres" }
2626
prometheus = { git = "https://github.com/MaterializeInc/rust-prometheus.git", default-features = false }
2727
repr = { path = "../repr" }
2828
sql = { path = "../sql" }

‎src/sql/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ mz-avro = { path = "../avro", features = ["snappy"] }
2525
ore = { path = "../ore" }
2626
parse_duration = "2.1.1"
2727
pgrepr = { path = "../pgrepr" }
28-
postgres-types = { version = "0.2.0", features = ["with-chrono-0_4", "with-uuid-0_8"] }
28+
postgres-types = { git = "https://github.com/MaterializeInc/rust-postgres", features = ["with-chrono-0_4", "with-uuid-0_8"] }
2929
rdkafka = { git = "https://github.com/fede1024/rust-rdkafka.git", features = ["cmake-build", "ssl-vendored", "gssapi-vendored", "libz-static"] }
3030
regex = "1.4.5"
3131
repr = { path = "../repr" }
@@ -35,7 +35,7 @@ serde = { version = "1.0.125", features = ["derive"] }
3535
serde_json = "1.0.64"
3636
sql-parser = { path = "../sql-parser" }
3737
tokio = { version = "1.4.0", features = ["fs"] }
38-
tokio-postgres = "0.7.1"
38+
tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres" }
3939
unicase = "2.6.0"
4040
url = "2.2.1"
4141
uuid = { version = "0.8.2", features = ["serde", "v4"] }

‎src/sqllogictest/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ materialized = { path = "../materialized" }
1616
md-5 = "0.9.0"
1717
ore = { path = "../ore" }
1818
pgrepr = { path = "../pgrepr" }
19-
postgres-protocol = "0.6.1"
19+
postgres-protocol = { git = "https://github.com/MaterializeInc/rust-postgres" }
2020
regex = "1.4.5"
2121
repr = { path = "../repr" }
2222
serde_json = "1.0.64"
@@ -25,6 +25,6 @@ structopt = "0.3.21"
2525
tempfile = "3.2.0"
2626
timely = { git = "https://github.com/TimelyDataflow/timely-dataflow", default-features = false, features = ["bincode"] }
2727
tokio = "1.4.0"
28-
tokio-postgres = { version = "0.7.1", features = ["with-chrono-0_4", "with-uuid-0_8", "with-serde_json-1"] }
28+
tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres", features = ["with-chrono-0_4", "with-uuid-0_8", "with-serde_json-1"] }
2929
uuid = "0.8.2"
3030
walkdir = "2.3.2"

‎src/symbiosis/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ repr = { path = "../repr" }
1717
serde_json = "1.0.64"
1818
sql = { path = "../sql" }
1919
tokio = "1.4.0"
20-
tokio-postgres = { version = "0.7.1", features = ["with-chrono-0_4", "with-serde_json-1"] }
20+
tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres", features = ["with-chrono-0_4", "with-serde_json-1"] }
2121
uuid = "0.8.2"
2222
whoami = "1.1.2"

‎src/testdrive/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ mz-avro = { path = "../avro", features = ["snappy"] }
2727
ore = { path = "../ore" }
2828
parse_duration = "2.1.1"
2929
pgrepr = { path = "../pgrepr" }
30-
postgres_array = "0.11.0"
30+
postgres_array = { git = "https://github.com/MaterializeInc/rust-postgres-array" }
3131
protobuf = { version = "2.17.0", features = ["with-serde"] }
3232
rand = "0.8.3"
3333
rdkafka = { git = "https://github.com/fede1024/rust-rdkafka.git", features = ["cmake-build", "libz-static"] }
@@ -48,7 +48,7 @@ structopt = "0.3.21"
4848
tempfile = "3.2.0"
4949
termcolor = "1.1.2"
5050
tokio = "1.4.0"
51-
tokio-postgres = { version = "0.7.1", features = ["with-chrono-0_4", "with-serde_json-1"] }
51+
tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres", features = ["with-chrono-0_4", "with-serde_json-1"] }
5252
tokio-stream = "0.1.5"
5353
url = "2.2.1"
5454
uuid = "0.8.2"

‎test/correctness/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ mz-process-collector = { path = "../../src/mz-process-collector" }
2020
ore = { path = "../../src/ore" }
2121
parse_duration = "2.1.1"
2222
pgrepr = { path = "../../src/pgrepr" }
23-
postgres = "0.19.0"
24-
postgres-types = "0.2.0"
23+
postgres = { git = "https://github.com/MaterializeInc/rust-postgres" }
24+
postgres-types = { git = "https://github.com/MaterializeInc/rust-postgres" }
2525
prometheus = { git = "https://github.com/MaterializeInc/rust-prometheus.git", default-features = false }
2626
regex = "1.4.5"
2727
serde = { version = "1.0.125", features = ["derive"] }
2828
structopt = "0.3.21"
2929
tokio = "1.4.0"
30-
tokio-postgres = "0.7.1"
30+
tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres" }
3131
toml = "0.5.8"

‎test/metabase/smoketest/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ log = "0.4.13"
1212
metabase = { path = "../../../src/metabase" }
1313
ore = { path = "../../../src/ore" }
1414
tokio = "1.4.0"
15-
tokio-postgres = "0.7.1"
15+
tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres" }

‎test/performance/perf-kinesis/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ rusoto_kinesis = { git = "https://github.com/rusoto/rusoto.git" }
2222
structopt = "0.3.21"
2323
test-util = { path = "../../test-util" }
2424
tokio = "1.4.0"
25-
tokio-postgres = "0.7.1"
25+
tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres" }

‎test/performance/perf-upsert/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ futures = "0.3.13"
1414
futures-channel = "0.3.14"
1515
hex = "0.4.3"
1616
log = "0.4.13"
17-
postgres-types = "0.2.0"
17+
postgres-types = { git = "https://github.com/MaterializeInc/rust-postgres" }
1818
rand = "0.8.3"
1919
rand_distr = "0.4.0"
2020
structopt = "0.3.21"
2121
test-util = { path = "../../test-util" }
2222
tokio = "1.4.0"
23-
tokio-postgres = "0.7.1"
23+
tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres" }

‎test/smith/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ env_logger = "0.8.3"
1111
futures = "0.3.13"
1212
futures-channel = "0.3.14"
1313
log = "0.4.13"
14-
postgres-types = "0.2.0"
14+
postgres-types = { git = "https://github.com/MaterializeInc/rust-postgres" }
1515
reqwest = { version = "0.11.2", features = ["json"] }
1616
serde = { version = "1.0.125", features = ["derive"] }
1717
serde_json = "1.0.64"
1818
structopt = "0.3.21"
1919
test-util = { path = "../test-util" }
2020
tokio = "1.4.0"
21-
tokio-postgres = "0.7.1"
21+
tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres" }
2222
url = "2.2.1"

‎test/test-util/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ ore = { path = "../../src/ore" }
1414
rand = "0.8.3"
1515
rdkafka = { git = "https://github.com/fede1024/rust-rdkafka.git", features = ["cmake-build", "libz-static"] }
1616
tokio = "1.4.0"
17-
tokio-postgres = "0.7.1"
17+
tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres" }

0 commit comments

Comments
 (0)