diff --git a/Cargo.lock b/Cargo.lock index 2e3ef23..dfa1f2c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -493,9 +493,9 @@ dependencies = [ [[package]] name = "crossbeam-queue" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115" dependencies = [ "crossbeam-utils", ] @@ -871,15 +871,6 @@ dependencies = [ "ahash 0.7.8", ] -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash 0.8.11", -] - [[package]] name = "hashbrown" version = "0.14.5" @@ -896,6 +887,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -1166,15 +1163,6 @@ version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" -[[package]] -name = "lru" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670" -dependencies = [ - "hashbrown 0.13.2", -] - [[package]] name = "lru" version = "0.12.3" @@ -1261,27 +1249,23 @@ dependencies = [ [[package]] name = "mysql" -version = "24.0.0" +version = "26.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfe2babc5f5b354eab9c0a0e40da3e69c4d77421c8b9b6ee03f97acc75bd7955" +checksum = "64453aedc258ac8c720b46c8264302fad39cef6c02483f68adbad4bcd22d6fab" dependencies = [ "bufstream", "bytes", - "crossbeam", + "crossbeam-queue", "flate2", "io-enum", "libc", - "lru 0.10.1", - "mysql_common 0.30.6", + "lru", + "mysql_common 0.34.1", "named_pipe", - "native-tls", - "once_cell", - "pem 2.0.1", + "pem 3.0.4", "percent-encoding", - "serde", - "serde_json", "socket2", - "twox-hash 1.6.3", + "twox-hash 2.1.0", "url", ] @@ -1292,7 +1276,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56b0d8a0db9bf6d2213e11f2c701cb91387b0614361625ab7b9743b41aa4938f" dependencies = [ "darling", - "heck", + "heck 0.4.1", "num-bigint", "proc-macro-crate 1.3.1", "proc-macro-error", @@ -1303,6 +1287,24 @@ dependencies = [ "thiserror", ] +[[package]] +name = "mysql-common-derive" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deb6d9ff4094f6d58d3f892fc558e60048476213dd17dcf904b62202e9029da6" +dependencies = [ + "darling", + "heck 0.5.0", + "num-bigint", + "proc-macro-crate 3.1.0", + "proc-macro-error2", + "proc-macro2", + "quote", + "syn 2.0.66", + "termcolor", + "thiserror", +] + [[package]] name = "mysql_async" version = "0.33.0" @@ -1317,7 +1319,7 @@ dependencies = [ "futures-util", "keyed_priority_queue", "lazy_static", - "lru 0.12.3", + "lru", "mio", "mysql_common 0.31.0", "native-tls", @@ -1357,7 +1359,7 @@ dependencies = [ "frunk", "lazy_static", "lexical", - "mysql-common-derive", + "mysql-common-derive 0.30.2", "num-bigint", "num-traits", "rand 0.8.5", @@ -1396,7 +1398,7 @@ dependencies = [ "flate2", "frunk", "lazy_static", - "mysql-common-derive", + "mysql-common-derive 0.30.2", "num-bigint", "num-traits", "rand 0.8.5", @@ -1412,7 +1414,39 @@ dependencies = [ "thiserror", "time", "uuid", - "zstd", + "zstd 0.12.4", +] + +[[package]] +name = "mysql_common" +version = "0.34.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34a9141e735d5bb02414a7ac03add09522466d4db65bdd827069f76ae0850e58" +dependencies = [ + "base64 0.22.1", + "bitflags 2.5.0", + "btoi", + "byteorder", + "bytes", + "cc", + "cmake", + "crc32fast", + "flate2", + "lazy_static", + "mysql-common-derive 0.32.0", + "num-bigint", + "num-traits", + "rand 0.8.5", + "regex", + "saturating", + "serde", + "serde_json", + "sha1", + "sha2", + "subprocess", + "thiserror", + "uuid", + "zstd 0.13.2", ] [[package]] @@ -1603,16 +1637,6 @@ dependencies = [ "base64 0.13.1", ] -[[package]] -name = "pem" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b13fe415cdf3c8e44518e18a7c95a13431d9bdf6d15367d82b23c377fdd441a" -dependencies = [ - "base64 0.21.7", - "serde", -] - [[package]] name = "pem" version = "3.0.4" @@ -1783,6 +1807,28 @@ dependencies = [ "version_check", ] +[[package]] +name = "proc-macro-error-attr2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "proc-macro-error2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" +dependencies = [ + "proc-macro-error-attr2", + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "proc-macro2" version = "1.0.83" @@ -2997,7 +3043,16 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" dependencies = [ - "zstd-safe", + "zstd-safe 6.0.6", +] + +[[package]] +name = "zstd" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" +dependencies = [ + "zstd-safe 7.2.1", ] [[package]] @@ -3010,6 +3065,15 @@ dependencies = [ "zstd-sys", ] +[[package]] +name = "zstd-safe" +version = "7.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" +dependencies = [ + "zstd-sys", +] + [[package]] name = "zstd-sys" version = "2.0.10+zstd.1.5.6" diff --git a/Cargo.toml b/Cargo.toml index 4151708..1511e71 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,7 @@ rustls = { version = "0.22.1", optional = true } [dev-dependencies] postgres = "0.19.1" -mysql = "24" +mysql = "26" mysql_async = "0.33.0" slab = "0.4.2" tokio = { version = "1.15.0", features = ["full"] }