From 64b243ea827dadb27c3809dcdfc5d5ab97c2dfca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20K=C3=B6rber?= Date: Tue, 29 Aug 2023 21:34:01 +0200 Subject: [PATCH] vendor sqlx with fix --- .gitmodules | 3 +++ rust/Cargo.lock | 14 -------------- rust/Cargo.toml | 3 ++- rust/vendor/sqlx | 1 + 4 files changed, 6 insertions(+), 15 deletions(-) create mode 160000 rust/vendor/sqlx diff --git a/.gitmodules b/.gitmodules index e69de29..0361355 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "rust/vendor/sqlx"] + path = rust/vendor/sqlx + url = https://github.com/hakoerber/sqlx diff --git a/rust/Cargo.lock b/rust/Cargo.lock index b9a78a9..3ab7d07 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -1885,8 +1885,6 @@ dependencies = [ [[package]] name = "sqlx" version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e58421b6bc416714d5115a2ca953718f6c621a51b68e4f4922aea5a4391a721" dependencies = [ "sqlx-core", "sqlx-macros", @@ -1898,8 +1896,6 @@ dependencies = [ [[package]] name = "sqlx-core" version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4cef4251aabbae751a3710927945901ee1d97ee96d757f6880ebb9a79bfd53" dependencies = [ "ahash", "atoi", @@ -1942,8 +1938,6 @@ dependencies = [ [[package]] name = "sqlx-macros" version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "208e3165167afd7f3881b16c1ef3f2af69fa75980897aac8874a0696516d12c2" dependencies = [ "proc-macro2", "quote", @@ -1955,8 +1949,6 @@ dependencies = [ [[package]] name = "sqlx-macros-core" version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a4a8336d278c62231d87f24e8a7a74898156e34c1c18942857be2acb29c7dfc" dependencies = [ "dotenvy", "either", @@ -1981,8 +1973,6 @@ dependencies = [ [[package]] name = "sqlx-mysql" version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca69bf415b93b60b80dc8fda3cb4ef52b2336614d8da2de5456cc942a110482" dependencies = [ "atoi", "base64 0.21.2", @@ -2024,8 +2014,6 @@ dependencies = [ [[package]] name = "sqlx-postgres" version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0db2df1b8731c3651e204629dd55e52adbae0462fa1bdcbed56a2302c18181e" dependencies = [ "atoi", "base64 0.21.2", @@ -2064,8 +2052,6 @@ dependencies = [ [[package]] name = "sqlx-sqlite" version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4c21bf34c7cae5b283efb3ac1bcc7670df7561124dc2f8bdc0b59be40f79a2" dependencies = [ "atoi", "flume", diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 542213c..e10d43a 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -83,7 +83,8 @@ features = [ ] [dependencies.sqlx] -version = "0.7" +# version = "0.7" +path = "./vendor/sqlx" features = [ "runtime-tokio-rustls", # "offline", diff --git a/rust/vendor/sqlx b/rust/vendor/sqlx new file mode 160000 index 0000000..3cbd7ac --- /dev/null +++ b/rust/vendor/sqlx @@ -0,0 +1 @@ +Subproject commit 3cbd7ac2bd6312c342b1b7a47611a55a9bf414c1