Bump sqlx from 0.5.13 to 0.6.0

Cargo.lock

@@ -162,9 +162,9 @@ dependencies = [
 
 [[package]]
 name = "atoi"
-version = "0.4.0"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "616896e05fc0e2649463a93a15183c6a16bf03413a7af88ef1285ddedfa9cda5"
+checksum = "d7c57d12312ff59c811c0643f4d80830505833c9ffaebd193d819392b265be8e"
 dependencies = [
  "num-traits",
 ]
@@ -1014,30 +1014,15 @@ dependencies = [
  "wasmtime-types",
 ]
 
-[[package]]
-name = "crc"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49fc9a695bca7f35f5f4c15cddc84415f66a74ea78eef08e90c5024f2b540e23"
-dependencies = [
- "crc-catalog 1.1.1",
-]
-
 [[package]]
 name = "crc"
 version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53757d12b596c16c78b83458d732a5d1a17ab3f53f2f7412f6fb57cc8a140ab3"
 dependencies = [
- "crc-catalog 2.1.0",
+ "crc-catalog",
 ]
 
-[[package]]
-name = "crc-catalog"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccaeedb56da03b09f598226e25e80088cb4cd25f316e6e4df7d695f0feeb1403"
-
 [[package]]
 name = "crc-catalog"
 version = "2.1.0"
@@ -1762,14 +1747,17 @@ name = "hashbrown"
 version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3"
+dependencies = [
+ "ahash",
+]
 
 [[package]]
 name = "hashlink"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf"
+checksum = "d452c155cb93fecdfb02a73dd57b5d8e442c2063bd7aac72f1bc5e4263a43086"
 dependencies = [
- "hashbrown 0.11.2",
+ "hashbrown 0.12.1",
 ]
 
 [[package]]
@@ -2210,7 +2198,7 @@ dependencies = [
  "tokio",
  "tokio-rustls 0.23.4",
  "tracing",
- "webpki-roots 0.22.3",
+ "webpki-roots",
 ]
 
 [[package]]
@@ -2382,7 +2370,7 @@ name = "mas-data-model"
 version = "0.1.0"
 dependencies = [
  "chrono",
- "crc 3.0.0",
+ "crc",
  "mas-iana",
  "mas-jose",
  "oauth2-types",
@@ -2418,7 +2406,7 @@ dependencies = [
  "axum-extra",
  "axum-macros",
  "chrono",
- "crc 3.0.0",
+ "crc",
  "data-encoding",
  "elliptic-curve",
  "headers",
@@ -3644,7 +3632,7 @@ dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "webpki-roots 0.22.3",
+ "webpki-roots",
  "winreg",
 ]
 
@@ -4202,9 +4190,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx"
-version = "0.5.13"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "551873805652ba0d912fec5bbb0f8b4cdd96baf8e2ebf5970e5671092966019b"
+checksum = "1f82cbe94f41641d6c410ded25bbf5097c240cefdf8e3b06d04198d0a96af6a4"
 dependencies = [
  "sqlx-core",
  "sqlx-macros",
@@ -4212,9 +4200,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-core"
-version = "0.5.13"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e48c61941ccf5ddcada342cd59e3e5173b007c509e1e8e990dafc830294d9dc5"
+checksum = "6b69bf218860335ddda60d6ce85ee39f6cf6e5630e300e19757d1de15886a093"
 dependencies = [
  "ahash",
  "atoi",
@@ -4223,7 +4211,7 @@ dependencies = [
  "byteorder",
  "bytes 1.1.0",
  "chrono",
- "crc 2.1.0",
+ "crc",
  "crossbeam-queue",
  "dirs",
  "either",
@@ -4246,7 +4234,8 @@ dependencies = [
  "paste",
  "percent-encoding",
  "rand",
- "rustls 0.19.1",
+ "rustls 0.20.6",
+ "rustls-pemfile",
  "serde",
  "serde_json",
  "sha-1 0.10.0",
@@ -4258,16 +4247,15 @@ dependencies = [
  "thiserror",
  "tokio-stream",
  "url",
- "webpki 0.21.4",
+ "webpki-roots",
- "webpki-roots 0.21.1",
  "whoami",
 ]
 
 [[package]]
 name = "sqlx-macros"
-version = "0.5.13"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc0fba2b0cae21fc00fe6046f8baa4c7fcb49e379f0f592b04696607f69ed2e1"
+checksum = "f40c63177cf23d356b159b60acd27c54af7423f1736988502e36bae9a712118f"
 dependencies = [
  "dotenv",
  "either",
@@ -4287,13 +4275,13 @@ dependencies = [
 
 [[package]]
 name = "sqlx-rt"
-version = "0.5.13"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4db708cd3e459078f85f39f96a00960bd841f66ee2a669e90bf36907f5a79aae"
+checksum = "874e93a365a598dc3dadb197565952cb143ae4aa716f7bcc933a8d836f6bf89f"
 dependencies = [
  "once_cell",
  "tokio",
- "tokio-rustls 0.22.0",
+ "tokio-rustls 0.23.4",
 ]
 
 [[package]]
@@ -5392,15 +5380,6 @@ dependencies = [
  "untrusted",
 ]
 
-[[package]]
-name = "webpki-roots"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940"
-dependencies = [
- "webpki 0.21.4",
-]
-
 [[package]]
 name = "webpki-roots"
 version = "0.22.3"

crates/axum-utils/Cargo.toml

@@ -22,7 +22,7 @@ serde = "1.0.137"
 serde_with = "1.14.0"
 serde_urlencoded = "0.7.1"
 serde_json = "1.0.81"
-sqlx = "0.5.13"
+sqlx = "0.6.0"
 thiserror = "1.0.31"
 tokio = "1.19.2"
 tower = { version = "0.4.12", features = ["util"] }

crates/config/Cargo.toml

@@ -21,7 +21,7 @@ url = { version = "2.2.2", features = ["serde"] }
 serde = { version = "1.0.137", features = ["derive"] }
 serde_with = { version = "1.14.0", features = ["hex", "chrono"] }
 serde_json = "1.0.81"
-sqlx = { version = "0.5.13", features = ["runtime-tokio-rustls", "postgres"] }
+sqlx = { version = "0.6.0", features = ["runtime-tokio-rustls", "postgres"] }
 lettre = { version = "0.10.0-rc.7", default-features = false, features = ["serde", "builder"] }
 
 rand = "0.8.5"

crates/config/src/sections/database.rs

@@ -209,7 +209,7 @@ impl DatabaseConfig {
         PgPoolOptions::new()
             .max_connections(self.max_connections.into())
             .min_connections(self.min_connections)
-            .connect_timeout(self.connect_timeout)
+            .acquire_timeout(self.connect_timeout)
             .idle_timeout(self.idle_timeout)
             .max_lifetime(self.max_lifetime)
             .connect_with(options)

crates/handlers/Cargo.toml

@@ -28,7 +28,7 @@ axum-extra = { version = "0.3.4", features = ["cookie-private"] }
 lettre = { version = "0.10.0-rc.7", default-features = false, features = ["builder"] }
 
 # Database access
-sqlx = { version = "0.5.13", features = ["runtime-tokio-rustls", "postgres"] }
+sqlx = { version = "0.6.0", features = ["runtime-tokio-rustls", "postgres"] }
 
 # Various structure (de)serialization
 serde = { version = "1.0.137", features = ["derive"] }

crates/storage/Cargo.toml

@@ -7,7 +7,7 @@ license = "Apache-2.0"
 
 [dependencies]
 tokio = "1.19.2"
-sqlx = { version = "0.5.13", features = ["runtime-tokio-rustls", "postgres", "migrate", "chrono", "offline", "json"] }
+sqlx = { version = "0.6.0", features = ["runtime-tokio-rustls", "postgres", "migrate", "chrono", "offline", "json"] }
 chrono = { version = "0.4.19", features = ["serde"] }
 serde = { version = "1.0.137", features = ["derive"] }
 serde_json = "1.0.81"

crates/tasks/Cargo.toml

@@ -11,6 +11,6 @@ async-trait = "0.1.56"
 tokio-stream = "0.1.9"
 futures-util = "0.3.21"
 tracing = "0.1.35"
-sqlx = { version = "0.5.13", features = ["runtime-tokio-rustls", "postgres"] }
+sqlx = { version = "0.6.0", features = ["runtime-tokio-rustls", "postgres"] }
 
 mas-storage = { path = "../storage" }