From 42a4fea3881696b34b763a19145a17c69df14dd4 Mon Sep 17 00:00:00 2001 From: Test User Date: Fri, 1 Dec 2023 17:55:54 -0800 Subject: [PATCH] Upgrade sqlx to 0.7.3; run migrations --- ...7360f9d6a1377f8f5777555555b9ddcd637cb.json | 34 +++++++++ ...ce5a62eadc15ffd0ea4fb5437a995a153deb0.json | 22 ------ Cargo.lock | 76 ++++++++++++------- 3 files changed, 82 insertions(+), 50 deletions(-) create mode 100644 .sqlx/query-11c8a239a12caf99448c5a65ac17360f9d6a1377f8f5777555555b9ddcd637cb.json delete mode 100644 .sqlx/query-6368dd70667549f0c0b0b9bf33cce5a62eadc15ffd0ea4fb5437a995a153deb0.json diff --git a/.sqlx/query-11c8a239a12caf99448c5a65ac17360f9d6a1377f8f5777555555b9ddcd637cb.json b/.sqlx/query-11c8a239a12caf99448c5a65ac17360f9d6a1377f8f5777555555b9ddcd637cb.json new file mode 100644 index 00000000..82ed5c2a --- /dev/null +++ b/.sqlx/query-11c8a239a12caf99448c5a65ac17360f9d6a1377f8f5777555555b9ddcd637cb.json @@ -0,0 +1,34 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT be_verbose, language, auto_detect_lang FROM guilds WHERE guild_id = $1", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "be_verbose", + "type_info": "Bool" + }, + { + "ordinal": 1, + "name": "language", + "type_info": "Text" + }, + { + "ordinal": 2, + "name": "auto_detect_lang", + "type_info": "Bool" + } + ], + "parameters": { + "Left": [ + "Int8" + ] + }, + "nullable": [ + false, + false, + false + ] + }, + "hash": "11c8a239a12caf99448c5a65ac17360f9d6a1377f8f5777555555b9ddcd637cb" +} diff --git a/.sqlx/query-6368dd70667549f0c0b0b9bf33cce5a62eadc15ffd0ea4fb5437a995a153deb0.json b/.sqlx/query-6368dd70667549f0c0b0b9bf33cce5a62eadc15ffd0ea4fb5437a995a153deb0.json deleted file mode 100644 index f2f85149..00000000 --- a/.sqlx/query-6368dd70667549f0c0b0b9bf33cce5a62eadc15ffd0ea4fb5437a995a153deb0.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "SELECT be_verbose FROM guilds WHERE guild_id = $1", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "be_verbose", - "type_info": "Bool" - } - ], - "parameters": { - "Left": [ - "Int8" - ] - }, - "nullable": [ - false - ] - }, - "hash": "6368dd70667549f0c0b0b9bf33cce5a62eadc15ffd0ea4fb5437a995a153deb0" -} diff --git a/Cargo.lock b/Cargo.lock index 9d095962..1956c990 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -146,6 +146,16 @@ dependencies = [ "num-traits", ] +[[package]] +name = "atomic-write-file" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edcdbedc2236483ab103a53415653d6b4442ea6141baf1ffa85df29635e88436" +dependencies = [ + "nix", + "rand", +] + [[package]] name = "audiopus" version = "0.2.0" @@ -1518,9 +1528,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libsqlite3-sys" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" +checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" dependencies = [ "cc", "pkg-config", @@ -1666,6 +1676,17 @@ dependencies = [ "getrandom", ] +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.4.1", + "cfg-if", + "libc", +] + [[package]] name = "no-std-net" version = "0.6.0" @@ -2335,7 +2356,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.25.2", + "webpki-roots", "winreg", ] @@ -3285,9 +3306,9 @@ dependencies = [ [[package]] name = "sqlx" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e50c216e3624ec8e7ecd14c6a6a6370aad6ee5d8cfc3ab30b5162eeeef2ed33" +checksum = "dba03c279da73694ef99763320dea58b51095dfe87d001b1d4b5fe78ba8763cf" dependencies = [ "sqlx-core", "sqlx-macros", @@ -3298,9 +3319,9 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d6753e460c998bbd4cd8c6f0ed9a64346fcca0723d6e75e52fdc351c5d2169d" +checksum = "d84b0a3c3739e220d94b3239fd69fb1f74bc36e16643423bd99de3b43c21bfbd" dependencies = [ "ahash", "atoi", @@ -3337,14 +3358,14 @@ dependencies = [ "tokio-stream", "tracing", "url", - "webpki-roots 0.24.0", + "webpki-roots", ] [[package]] name = "sqlx-macros" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a793bb3ba331ec8359c1853bd39eed32cdd7baaf22c35ccf5c92a7e8d1189ec" +checksum = "89961c00dc4d7dffb7aee214964b065072bff69e36ddb9e2c107541f75e4f2a5" dependencies = [ "proc-macro2", "quote", @@ -3355,10 +3376,11 @@ dependencies = [ [[package]] name = "sqlx-macros-core" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4ee1e104e00dedb6aa5ffdd1343107b0a4702e862a84320ee7cc74782d96fc" +checksum = "d0bd4519486723648186a08785143599760f7cc81c52334a55d6a83ea1e20841" dependencies = [ + "atomic-write-file", "dotenvy", "either", "heck", @@ -3381,9 +3403,9 @@ dependencies = [ [[package]] name = "sqlx-mysql" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "864b869fdf56263f4c95c45483191ea0af340f9f3e3e7b4d57a61c7c87a970db" +checksum = "e37195395df71fd068f6e2082247891bc11e3289624bbc776a0cdfa1ca7f1ea4" dependencies = [ "atoi", "base64 0.21.5", @@ -3424,9 +3446,9 @@ dependencies = [ [[package]] name = "sqlx-postgres" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb7ae0e6a97fb3ba33b23ac2671a5ce6e3cabe003f451abd5a56e7951d975624" +checksum = "d6ac0ac3b7ccd10cc96c7ab29791a7dd236bd94021f31eec7ba3d46a74aa1c24" dependencies = [ "atoi", "base64 0.21.5", @@ -3464,9 +3486,9 @@ dependencies = [ [[package]] name = "sqlx-sqlite" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59dc83cf45d89c555a577694534fcd1b55c545a816c816ce51f20bbe56a4f3f" +checksum = "210976b7d948c7ba9fced8ca835b11cbb2d677c59c79de41ac0d397e14547490" dependencies = [ "atoi", "flume 0.11.0", @@ -3483,6 +3505,7 @@ dependencies = [ "time", "tracing", "url", + "urlencoding", ] [[package]] @@ -3840,7 +3863,7 @@ dependencies = [ "tokio", "tokio-rustls 0.24.1", "tungstenite 0.20.1", - "webpki-roots 0.25.2", + "webpki-roots", ] [[package]] @@ -4193,6 +4216,12 @@ dependencies = [ "serde", ] +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + [[package]] name = "utf-8" version = "0.7.6" @@ -4347,15 +4376,6 @@ dependencies = [ "untrusted 0.9.0", ] -[[package]] -name = "webpki-roots" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" -dependencies = [ - "rustls-webpki", -] - [[package]] name = "webpki-roots" version = "0.25.2"