Merge branch 'main' into dom/merkle-subscribe

Shopify · Sep 27, 2023 · 1bb6a9f · 1bb6a9f
2 parents 4340749 + 12adb41
commit 1bb6a9f
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 22 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/data_types/Cargo.toml b/data_types/Cargo.toml
@@ -17,7 +17,7 @@ once_cell = "1"
 ordered-float = "4"
 schema = { path = "../schema" }
 sha2 = "0.10"
-sqlx = { version = "0.7.1", features = ["runtime-tokio-rustls", "postgres", "uuid"] }
+sqlx = { version = "0.7.2", features = ["runtime-tokio-rustls", "postgres", "uuid"] }
 thiserror = "1.0.49"
 uuid = { version = "1", features = ["v4"] }
 workspace-hack = { version = "0.1", path = "../workspace-hack" }

diff --git a/garbage_collector/Cargo.toml b/garbage_collector/Cargo.toml
@@ -32,5 +32,5 @@ metric = { path = "../metric" }
 once_cell = { version = "1.18", features = ["parking_lot"] }
 parquet_file = { path = "../parquet_file" }
 tempfile = "3"
-sqlx = { version = "0.7.1", features = [ "runtime-tokio-rustls" ] }
+sqlx = { version = "0.7.2", features = [ "runtime-tokio-rustls" ] }
 
diff --git a/iox_catalog/Cargo.toml b/iox_catalog/Cargo.toml
@@ -19,7 +19,7 @@ parking_lot = { version = "0.12" }
 serde = { version = "1.0", features = ["derive"] }
 siphasher = "1.0"
 snafu = "0.7"
-sqlx = { version = "0.7.1", features = [ "runtime-tokio-rustls" , "postgres", "uuid", "sqlite" ] }
+sqlx = { version = "0.7.2", features = [ "runtime-tokio-rustls" , "postgres", "uuid", "sqlite" ] }
 sqlx-hotswap-pool = { path = "../sqlx-hotswap-pool" }
 thiserror = "1.0.49"
 tokio = { version = "1.32", features = ["io-util", "macros", "parking_lot", "rt-multi-thread", "time"] }

diff --git a/sqlx-hotswap-pool/Cargo.toml b/sqlx-hotswap-pool/Cargo.toml
@@ -10,7 +10,7 @@ license.workspace = true
 publish = false
 
 [dependencies]
-sqlx = { version = "0.7.1", features = ["runtime-tokio-rustls", "postgres", "json", "tls-rustls"] }
+sqlx = { version = "0.7.2", features = ["runtime-tokio-rustls", "postgres", "json", "tls-rustls"] }
 either = "1.9.0"
 futures = "0.3"
 workspace-hack = { version = "0.1", path = "../workspace-hack" }

diff --git a/test_helpers_end_to_end/Cargo.toml b/test_helpers_end_to_end/Cargo.toml
@@ -33,7 +33,7 @@ regex = "1.9"
 reqwest = { version = "0.11", default-features = false, features = ["json", "rustls-tls"] }
 serde_json = "1.0.105"
 snafu = "0.7"
-sqlx = { version = "0.7.1", features = [ "runtime-tokio-rustls" , "postgres", "uuid" ] }
+sqlx = { version = "0.7.2", features = [ "runtime-tokio-rustls" , "postgres", "uuid" ] }
 tempfile = "3.8.0"
 test_helpers = { path = "../test_helpers", features = ["future_timeout"] }
 tokio = { version = "1.32", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] }