diff --git a/Cargo.lock b/Cargo.lock index 9eaae0121dec..919359c2031a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -401,19 +401,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "bigdecimal" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9324c8014cd04590682b34f1e9448d38f0674d0f7b2dc553331016ef0e4e9ebc" -dependencies = [ - "autocfg", - "libm", - "num-bigint", - "num-integer", - "num-traits", -] - [[package]] name = "bindgen" version = "0.69.4" @@ -875,7 +862,7 @@ dependencies = [ "hex", "itertools 0.13.0", "log", - "mysql", + "mysql 25.0.1", "once_cell", "pac_cell", "postgres", @@ -1042,9 +1029,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", ] @@ -1381,21 +1368,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "form_urlencoded" version = "1.2.1" @@ -1405,58 +1377,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "frunk" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a351b59e12f97b4176ee78497dff72e4276fb1ceb13e19056aca7fa0206287" -dependencies = [ - "frunk_core", - "frunk_derives", - "frunk_proc_macros", -] - -[[package]] -name = "frunk_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af2469fab0bd07e64ccf0ad57a1438f63160c69b2e57f04a439653d68eb558d6" - -[[package]] -name = "frunk_derives" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fa992f1656e1707946bbba340ad244f0814009ef8c0118eb7b658395f19a2e" -dependencies = [ - "frunk_proc_macro_helpers", - "quote", - "syn 2.0.98", -] - -[[package]] -name = "frunk_proc_macro_helpers" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35b54add839292b743aeda6ebedbd8b11e93404f902c56223e51b9ec18a13d2c" -dependencies = [ - "frunk_core", - "proc-macro2", - "quote", - "syn 2.0.98", -] - -[[package]] -name = "frunk_proc_macros" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71b85a1d4a9a6b300b41c05e8e13ef2feca03e0334127f29eca9506a7fe13a93" -dependencies = [ - "frunk_core", - "frunk_proc_macro_helpers", - "quote", - "syn 2.0.98", -] - [[package]] name = "fsevent-sys" version = "4.1.0" @@ -2308,29 +2228,50 @@ dependencies = [ "io-enum", "libc", "lru", - "mysql_common", + "mysql_common 0.32.3", "named_pipe", - "native-tls", "pem", "percent-encoding", "serde", "serde_json", "socket2", - "twox-hash", + "twox-hash 1.6.3", + "url", +] + +[[package]] +name = "mysql" +version = "26.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64453aedc258ac8c720b46c8264302fad39cef6c02483f68adbad4bcd22d6fab" +dependencies = [ + "bufstream", + "bytes", + "crossbeam-queue", + "flate2", + "io-enum", + "libc", + "lru", + "mysql_common 0.34.1", + "named_pipe", + "pem", + "percent-encoding", + "socket2", + "twox-hash 2.1.0", "url", ] [[package]] name = "mysql-common-derive" -version = "0.31.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe0450cc9344afff34915f8328600ab5ae19260802a334d0f72d2d5bdda3bfe" +checksum = "deb6d9ff4094f6d58d3f892fc558e60048476213dd17dcf904b62202e9029da6" dependencies = [ "darling", - "heck 0.4.1", + "heck 0.5.0", "num-bigint", "proc-macro-crate", - "proc-macro-error", + "proc-macro-error2", "proc-macro2", "quote", "syn 2.0.98", @@ -2345,10 +2286,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d1e52cf194ab414202ead9dfda216d2a9ec59cc97ac024ba499ca686d82f040d" dependencies = [ "base64 0.21.7", - "bigdecimal 0.4.3", "bindgen", "bitflags 2.6.0", - "bitvec", "btoi", "byteorder", "bytes", @@ -2356,14 +2295,11 @@ dependencies = [ "cmake", "crc32fast", "flate2", - "frunk", "lazy_static", - "mysql-common-derive", "num-bigint", "num-traits", "rand 0.8.5", "regex", - "rust_decimal", "saturating", "serde", "serde_json", @@ -2372,35 +2308,49 @@ dependencies = [ "smallvec", "subprocess", "thiserror", - "time", "uuid 1.8.0", "zstd", ] [[package]] -name = "named_pipe" -version = "0.4.1" +name = "mysql_common" +version = "0.34.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad9c443cce91fc3e12f017290db75dde490d685cdaaf508d7159d7cf41f0eb2b" +checksum = "34a9141e735d5bb02414a7ac03add09522466d4db65bdd827069f76ae0850e58" dependencies = [ - "winapi", + "base64 0.22.1", + "bitflags 2.6.0", + "btoi", + "byteorder", + "bytes", + "cc", + "cmake", + "crc32fast", + "flate2", + "lazy_static", + "mysql-common-derive", + "num-bigint", + "num-traits", + "rand 0.8.5", + "regex", + "saturating", + "serde", + "serde_json", + "sha1", + "sha2", + "subprocess", + "thiserror", + "uuid 1.8.0", + "zstd", ] [[package]] -name = "native-tls" -version = "0.2.12" +name = "named_pipe" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +checksum = "ad9c443cce91fc3e12f017290db75dde490d685cdaaf508d7159d7cf41f0eb2b" dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", + "winapi", ] [[package]] @@ -2587,50 +2537,12 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "openssl" -version = "0.10.70" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61cfb4e166a8bb8c9b55c500bc2308550148ece889be90f609377e58140f42c6" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.98", -] - [[package]] name = "openssl-probe" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[package]] -name = "openssl-sys" -version = "0.9.105" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b22d5b84be05a8d6947c7cb71f7c849aa0f112acd4bf51c2a7c1c988ac0a9dc" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "owo-colors" version = "3.5.0" @@ -2867,6 +2779,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.98", +] + [[package]] name = "proc-macro2" version = "1.0.92" @@ -2918,7 +2852,7 @@ dependencies = [ "itertools 0.13.0", "log", "minijinja", - "mysql", + "mysql 26.0.0", "notify", "postgres", "prqlc-parser", @@ -4048,7 +3982,7 @@ checksum = "a1446cb4198848d1562301a3340424b4f425ef79f35ef9ee034769a9dd92c10d" dependencies = [ "async-trait", "asynchronous-codec", - "bigdecimal 0.3.1", + "bigdecimal", "byteorder", "bytes", "connection-string", @@ -4313,6 +4247,12 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "twox-hash" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7b17f197b3050ba473acf9181f7b1d3b66d1cf7356c6cc57886662276e65908" + [[package]] name = "typenum" version = "1.17.0" diff --git a/prqlc/prqlc/Cargo.toml b/prqlc/prqlc/Cargo.toml index c6618fae01b1..f0ea2750635a 100644 --- a/prqlc/prqlc/Cargo.toml +++ b/prqlc/prqlc/Cargo.toml @@ -110,7 +110,7 @@ duckdb = { version = "1.1.1", optional = true, features = [ "chrono", ] } futures = { version = "0.3.31", optional = true } -mysql = { version = "25", optional = true } +mysql = { version = "26", optional = true } postgres = { version = "0.19.10", optional = true } rusqlite = { version = "0.32.0", optional = true, features = [ "bundled",