diff --git a/Cargo.lock b/Cargo.lock index f261d66b1cf2..42ff86a86759 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3927,7 +3927,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ "base64 0.21.3", - "pem", + "pem 1.1.1", "ring", "serde", "serde_json", @@ -4176,15 +4176,6 @@ dependencies = [ "hashbrown 0.12.3", ] -[[package]] -name = "lru" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909" -dependencies = [ - "hashbrown 0.12.3", -] - [[package]] name = "lru" version = "0.10.1" @@ -4578,11 +4569,29 @@ dependencies = [ "serde", ] +[[package]] +name = "mysql-common-derive" +version = "0.30.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56b0d8a0db9bf6d2213e11f2c701cb91387b0614361625ab7b9743b41aa4938f" +dependencies = [ + "darling 0.20.3", + "heck 0.4.1", + "num-bigint", + "proc-macro-crate 1.3.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.31", + "termcolor", + "thiserror", +] + [[package]] name = "mysql_async" -version = "0.31.3" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2975442c70450b8f3a0400216321f6ab7b8bda177579f533d312ac511f913655" +checksum = "f5272f59b5b1f93d65f7f826c1f025d6e410e89fb50a67e05aa20b35a55a8c0a" dependencies = [ "bytes", "crossbeam", @@ -4591,18 +4600,18 @@ dependencies = [ "futures-sink", "futures-util", "lazy_static", - "lru 0.8.1", + "lru 0.10.1", "mio", "mysql_common", "native-tls", "once_cell", - "pem", + "pem 2.0.1", "percent-encoding", "pin-project", "priority-queue", "serde", "serde_json", - "socket2 0.4.9", + "socket2 0.5.3", "thiserror", "tokio", "tokio-native-tls", @@ -4613,14 +4622,14 @@ dependencies = [ [[package]] name = "mysql_common" -version = "0.29.2" +version = "0.30.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9006c95034ccf7b903d955f210469119f6c3477fc9c9e7a7845ce38a3e665c2a" +checksum = "57349d5a326b437989b6ee4dc8f2f34b0cc131202748414712a8e7d98952fc8c" dependencies = [ - "base64 0.13.1", + "base64 0.21.3", "bigdecimal", "bindgen", - "bitflags 1.3.2", + "bitflags 2.4.0", "bitvec", "byteorder", "bytes", @@ -4632,6 +4641,7 @@ dependencies = [ "frunk", "lazy_static", "lexical", + "mysql-common-derive", "num-bigint", "num-traits", "rand", @@ -5438,6 +5448,16 @@ 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.3", + "serde", +] + [[package]] name = "pem-rfc7468" version = "0.2.3" @@ -6095,7 +6115,7 @@ dependencies = [ "nom", "oauth2", "openidconnect", - "pem", + "pem 1.1.1", "prost", "prost-build", "prost-derive", @@ -10118,6 +10138,7 @@ dependencies = [ "aws-credential-types", "aws-sdk-s3", "aws-smithy-client", + "base64 0.21.3", "bitflags 2.4.0", "byteorder", "bytes", @@ -10128,8 +10149,6 @@ dependencies = [ "combine", "crossbeam-epoch", "crossbeam-utils", - "darling 0.14.4", - "darling_core 0.14.4", "deranged", "either", "fail", @@ -10190,6 +10209,7 @@ dependencies = [ "serde_json", "serde_with 3.3.0", "smallvec", + "socket2 0.5.3", "subtle", "syn 1.0.109", "syn 2.0.31", @@ -10200,6 +10220,8 @@ dependencies = [ "tokio-postgres 0.7.8", "tokio-stream", "tokio-util", + "toml_datetime", + "toml_edit", "tonic", "tower", "tracing", diff --git a/src/connector/Cargo.toml b/src/connector/Cargo.toml index 34b416fe4d8e..33e32c568511 100644 --- a/src/connector/Cargo.toml +++ b/src/connector/Cargo.toml @@ -56,8 +56,8 @@ itertools = "0.11" jsonschema-transpiler = "1.10.0" maplit = "1.0.2" moka = { version = "0.11", features = ["future"] } -mysql_async = { version = "0.31", default-features = false, features = ["default"] } -mysql_common = { version = "0.29.2", default-features = false, features = ["chrono"] } +mysql_async = { version = "0.32", default-features = false, features = ["default"] } +mysql_common = { version = "0.30", default-features = false, features = ["chrono"] } nexmark = { version = "0.2", features = ["serde"] } num-bigint = "0.4" opendal = "0.39" diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml index 8ea930c502d1..62dff0cda0f3 100644 --- a/src/workspace-hack/Cargo.toml +++ b/src/workspace-hack/Cargo.toml @@ -23,6 +23,7 @@ anyhow = { version = "1", features = ["backtrace"] } aws-credential-types = { version = "0.55", default-features = false, features = ["hardcoded-credentials"] } aws-sdk-s3 = { version = "0.28", features = ["native-tls"] } aws-smithy-client = { version = "0.55", default-features = false, features = ["native-tls", "rustls"] } +base64 = { version = "0.21", features = ["alloc"] } bitflags = { version = "2", default-features = false, features = ["std"] } byteorder = { version = "1", features = ["i128"] } bytes = { version = "1", features = ["serde"] } @@ -91,6 +92,7 @@ serde = { version = "1", features = ["alloc", "derive", "rc"] } serde_json = { version = "1", features = ["alloc"] } serde_with = { version = "3", features = ["json"] } smallvec = { version = "1", default-features = false, features = ["serde", "union", "write"] } +socket2 = { version = "0.5", default-features = false, features = ["all"] } subtle = { version = "2" } time = { version = "0.3", features = ["local-offset", "macros", "serde-well-known"] } tinyvec = { version = "1", features = ["alloc", "grab_spare_slice", "rustc_1_55"] } @@ -98,6 +100,8 @@ tokio = { version = "1", features = ["full", "stats", "tracing"] } tokio-postgres = { git = "https://github.com/madsim-rs/rust-postgres.git", rev = "4538cd6", features = ["with-chrono-0_4"] } tokio-stream = { git = "https://github.com/madsim-rs/tokio.git", rev = "fe39bb8e", features = ["fs", "net"] } tokio-util = { version = "0.7", features = ["codec", "io"] } +toml_datetime = { version = "0.6", default-features = false, features = ["serde"] } +toml_edit = { version = "0.19", features = ["serde"] } tonic = { version = "0.9", features = ["gzip", "tls-webpki-roots"] } tower = { version = "0.4", features = ["balance", "buffer", "filter", "limit", "load-shed", "retry", "timeout", "util"] } tracing = { version = "0.1", features = ["log"] } @@ -116,6 +120,7 @@ auto_enums = { version = "0.8", features = ["futures03"] } aws-credential-types = { version = "0.55", default-features = false, features = ["hardcoded-credentials"] } aws-sdk-s3 = { version = "0.28", features = ["native-tls"] } aws-smithy-client = { version = "0.55", default-features = false, features = ["native-tls", "rustls"] } +base64 = { version = "0.21", features = ["alloc"] } bitflags = { version = "2", default-features = false, features = ["std"] } byteorder = { version = "1", features = ["i128"] } bytes = { version = "1", features = ["serde"] } @@ -126,8 +131,6 @@ clap_builder = { version = "4", default-features = false, features = ["cargo", " combine = { version = "4" } crossbeam-epoch = { version = "0.9" } crossbeam-utils = { version = "0.8" } -darling = { version = "0.14" } -darling_core = { version = "0.14", default-features = false, features = ["suggestions"] } deranged = { version = "0.3", default-features = false, features = ["serde", "std"] } either = { version = "1" } fail = { version = "0.5", default-features = false, features = ["failpoints"] } @@ -188,9 +191,10 @@ serde = { version = "1", features = ["alloc", "derive", "rc"] } serde_json = { version = "1", features = ["alloc"] } serde_with = { version = "3", features = ["json"] } smallvec = { version = "1", default-features = false, features = ["serde", "union", "write"] } +socket2 = { version = "0.5", default-features = false, features = ["all"] } subtle = { version = "2" } -syn-dff4ba8e3ae991db = { package = "syn", version = "1", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] } -syn-f595c2ba2a3f28df = { package = "syn", version = "2", features = ["extra-traits", "full", "visit", "visit-mut"] } +syn-dff4ba8e3ae991db = { package = "syn", version = "1", features = ["extra-traits", "full", "visit", "visit-mut"] } +syn-f595c2ba2a3f28df = { package = "syn", version = "2", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] } time = { version = "0.3", features = ["local-offset", "macros", "serde-well-known"] } time-macros = { version = "0.2", default-features = false, features = ["formatting", "parsing", "serde"] } tinyvec = { version = "1", features = ["alloc", "grab_spare_slice", "rustc_1_55"] } @@ -198,6 +202,8 @@ tokio = { version = "1", features = ["full", "stats", "tracing"] } tokio-postgres = { git = "https://github.com/madsim-rs/rust-postgres.git", rev = "4538cd6", features = ["with-chrono-0_4"] } tokio-stream = { git = "https://github.com/madsim-rs/tokio.git", rev = "fe39bb8e", features = ["fs", "net"] } tokio-util = { version = "0.7", features = ["codec", "io"] } +toml_datetime = { version = "0.6", default-features = false, features = ["serde"] } +toml_edit = { version = "0.19", features = ["serde"] } tonic = { version = "0.9", features = ["gzip", "tls-webpki-roots"] } tower = { version = "0.4", features = ["balance", "buffer", "filter", "limit", "load-shed", "retry", "timeout", "util"] } tracing = { version = "0.1", features = ["log"] }