Upgrade to sqlx 0.8.3

This removes the git override we had
This commit is contained in:
Quentin Gliech
2025-01-06 12:11:55 +01:00
parent 966ac32a1c
commit caeaff2d73
3 changed files with 30 additions and 28 deletions

45
Cargo.lock generated
View File

@@ -2171,16 +2171,18 @@ version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
dependencies = [
"allocator-api2",
"equivalent",
"foldhash",
]
[[package]]
name = "hashlink"
version = "0.9.1"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af"
checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
dependencies = [
"hashbrown 0.14.5",
"hashbrown 0.15.2",
]
[[package]]
@@ -5838,8 +5840,9 @@ checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a"
[[package]]
name = "sqlx"
version = "0.8.2"
source = "git+https://github.com/launchbadge/sqlx.git?branch=main#42ce24dab87aad98f041cafb35cf9a7d5b2b09a7"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4410e73b3c0d8442c5f99b425d7a435b5ee0ae4167b3196771dd3f7a01be745f"
dependencies = [
"sqlx-core",
"sqlx-macros",
@@ -5850,8 +5853,9 @@ dependencies = [
[[package]]
name = "sqlx-core"
version = "0.8.2"
source = "git+https://github.com/launchbadge/sqlx.git?branch=main#42ce24dab87aad98f041cafb35cf9a7d5b2b09a7"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a007b6936676aa9ab40207cde35daab0a04b823be8ae004368c0793b96a61e0"
dependencies = [
"bytes",
"chrono",
@@ -5863,7 +5867,7 @@ dependencies = [
"futures-intrusive",
"futures-io",
"futures-util",
"hashbrown 0.14.5",
"hashbrown 0.15.2",
"hashlink",
"indexmap 2.7.0",
"ipnetwork",
@@ -5888,8 +5892,9 @@ dependencies = [
[[package]]
name = "sqlx-macros"
version = "0.8.2"
source = "git+https://github.com/launchbadge/sqlx.git?branch=main#42ce24dab87aad98f041cafb35cf9a7d5b2b09a7"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3112e2ad78643fef903618d78cf0aec1cb3134b019730edb039b69eaf531f310"
dependencies = [
"proc-macro2",
"quote",
@@ -5900,8 +5905,9 @@ dependencies = [
[[package]]
name = "sqlx-macros-core"
version = "0.8.2"
source = "git+https://github.com/launchbadge/sqlx.git?branch=main#42ce24dab87aad98f041cafb35cf9a7d5b2b09a7"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e9f90acc5ab146a99bf5061a7eb4976b573f560bc898ef3bf8435448dd5e7ad"
dependencies = [
"dotenvy",
"either",
@@ -5925,8 +5931,9 @@ dependencies = [
[[package]]
name = "sqlx-mysql"
version = "0.8.2"
source = "git+https://github.com/launchbadge/sqlx.git?branch=main#42ce24dab87aad98f041cafb35cf9a7d5b2b09a7"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4560278f0e00ce64938540546f59f590d60beee33fffbd3b9cd47851e5fff233"
dependencies = [
"atoi",
"base64 0.22.1",
@@ -5968,8 +5975,9 @@ dependencies = [
[[package]]
name = "sqlx-postgres"
version = "0.8.2"
source = "git+https://github.com/launchbadge/sqlx.git?branch=main#42ce24dab87aad98f041cafb35cf9a7d5b2b09a7"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c5b98a57f363ed6764d5b3a12bfedf62f07aa16e1856a7ddc2a0bb190a959613"
dependencies = [
"atoi",
"base64 0.22.1",
@@ -6007,8 +6015,9 @@ dependencies = [
[[package]]
name = "sqlx-sqlite"
version = "0.8.2"
source = "git+https://github.com/launchbadge/sqlx.git?branch=main#42ce24dab87aad98f041cafb35cf9a7d5b2b09a7"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f85ca71d3a5b24e64e1d08dd8fe36c6c95c339a896cc33068148906784620540"
dependencies = [
"atoi",
"chrono",

View File

@@ -292,7 +292,7 @@ features = ["preserve_order"]
# SQL database support
[workspace.dependencies.sqlx]
version = "0.8.2"
version = "0.8.3"
features = [
"runtime-tokio",
"tls-rustls-aws-lc-rs",
@@ -405,10 +405,3 @@ rayon.opt-level = 3
regalloc2.opt-level = 3
sha2.opt-level = 3
sqlx-macros.opt-level = 3
[patch.crates-io]
sqlx = { git = "https://github.com/launchbadge/sqlx.git", branch = "main" }
sqlx-core = { git = "https://github.com/launchbadge/sqlx.git", branch = "main" }
sqlx-macros = { git = "https://github.com/launchbadge/sqlx.git", branch = "main" }
sqlx-macros-core = { git = "https://github.com/launchbadge/sqlx.git", branch = "main" }
sqlx-postgres = { git = "https://github.com/launchbadge/sqlx.git", branch = "main" }

View File

@@ -58,7 +58,8 @@ skip = [
{ name = "regex-automata", version = "0.1.10" }, # ^
{ name = "regex-automata", version = "0.2.0" }, # icu_list depends on this old version
{ name = "indexmap", version = "1.9.3" }, # schemars depends on this old version
{ name = "hashbrown" }, # Too many versions :(
{ name = "hashbrown", version = "0.12.3" }, # schemars -> indexmap depends on this old version
{ name = "hashbrown", version = "0.14.5" }, # a few crates depend on this old version
# a few dependencies depend on the 1.x version of thiserror
{ name = "thiserror", version = "1.0.69" },
{ name = "thiserror-impl", version = "1.0.69" },
@@ -81,4 +82,3 @@ deny = ["oldtime"]
unknown-registry = "warn"
unknown-git = "warn"
allow-registry = ["https://github.com/rust-lang/crates.io-index"]
allow-git = ["https://github.com/launchbadge/sqlx.git"]