From 4279d1b958a3b258b66aed97b5b9f7f3fa194319 Mon Sep 17 00:00:00 2001 From: KellianDev Date: Tue, 6 Feb 2024 10:31:59 +0100 Subject: [PATCH 1/5] fix(deps): remove mysql and sqlite features for types in the workspace Cargo.toml --- Cargo.toml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9a4dfdf5fe..e61d12e66d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -102,15 +102,15 @@ sqlite = ["sqlx-sqlite", "sqlx-macros?/sqlite"] # types json = ["sqlx-macros?/json", "sqlx-mysql?/json", "sqlx-postgres?/json", "sqlx-sqlite?/json"] -bigdecimal = ["sqlx-core/bigdecimal", "sqlx-macros?/bigdecimal", "sqlx-mysql?/bigdecimal", "sqlx-postgres?/bigdecimal"] +bigdecimal = ["sqlx-core/bigdecimal", "sqlx-macros?/bigdecimal", "sqlx-postgres?/bigdecimal"] bit-vec = ["sqlx-core/bit-vec", "sqlx-macros?/bit-vec", "sqlx-postgres?/bit-vec"] -chrono = ["sqlx-core/chrono", "sqlx-macros?/chrono", "sqlx-mysql?/chrono", "sqlx-postgres?/chrono", "sqlx-sqlite?/chrono"] +chrono = ["sqlx-core/chrono", "sqlx-macros?/chrono", "sqlx-postgres?/chrono"] ipnetwork = ["sqlx-core/ipnetwork", "sqlx-macros?/ipnetwork", "sqlx-postgres?/ipnetwork"] mac_address = ["sqlx-core/mac_address", "sqlx-macros?/mac_address", "sqlx-postgres?/mac_address"] -rust_decimal = ["sqlx-core/rust_decimal", "sqlx-macros?/rust_decimal", "sqlx-mysql?/rust_decimal", "sqlx-postgres?/rust_decimal"] -time = ["sqlx-core/time", "sqlx-macros?/time", "sqlx-mysql?/time", "sqlx-postgres?/time", "sqlx-sqlite?/time"] -uuid = ["sqlx-core/uuid", "sqlx-macros?/uuid", "sqlx-mysql?/uuid", "sqlx-postgres?/uuid", "sqlx-sqlite?/uuid"] -regexp = ["sqlx-sqlite?/regexp"] +rust_decimal = ["sqlx-core/rust_decimal", "sqlx-macros?/rust_decimal", "sqlx-postgres?/rust_decimal"] +time = ["sqlx-core/time", "sqlx-macros?/time", "sqlx-postgres?/time"] +uuid = ["sqlx-core/uuid", "sqlx-macros?/uuid", "sqlx-postgres?/uuid"] +regexp = [] [workspace.dependencies] # Core Crates From c51d6a94df4305b270dd5d331182b840b1abdb17 Mon Sep 17 00:00:00 2001 From: KellianDev Date: Tue, 6 Feb 2024 10:32:02 +0100 Subject: [PATCH 2/5] fix(deps): remove mysql and sqlite features for types in the workspace Cargo.toml --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index e61d12e66d..47f4b7b637 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -100,7 +100,7 @@ mysql = ["sqlx-mysql", "sqlx-macros?/mysql"] sqlite = ["sqlx-sqlite", "sqlx-macros?/sqlite"] # types -json = ["sqlx-macros?/json", "sqlx-mysql?/json", "sqlx-postgres?/json", "sqlx-sqlite?/json"] +json = ["sqlx-macros?/json", "sqlx-postgres?/json"] bigdecimal = ["sqlx-core/bigdecimal", "sqlx-macros?/bigdecimal", "sqlx-postgres?/bigdecimal"] bit-vec = ["sqlx-core/bit-vec", "sqlx-macros?/bit-vec", "sqlx-postgres?/bit-vec"] From 6df415c33e752dd5e4414f63714c58cd4de50f2b Mon Sep 17 00:00:00 2001 From: KellianDev Date: Tue, 6 Feb 2024 10:33:28 +0100 Subject: [PATCH 3/5] fix(deps): remove some more sqlite and mysql in the workspace Cargo.toml --- Cargo.toml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 47f4b7b637..a72df221a0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -119,9 +119,7 @@ sqlx-macros-core = { version = "=0.7.3", path = "sqlx-macros-core" } sqlx-macros = { version = "=0.7.3", path = "sqlx-macros" } # Driver crates -sqlx-mysql = { version = "=0.7.3", path = "sqlx-mysql" } sqlx-postgres = { version = "=0.7.3", path = "sqlx-postgres" } -sqlx-sqlite = { version = "=0.7.3", path = "sqlx-sqlite" } # Facade crate (for reference from sqlx-cli) sqlx = { version = "=0.7.3", path = ".", default-features = false } @@ -153,9 +151,7 @@ default-features = false sqlx-core = { workspace = true, features = ["offline", "migrate"] } sqlx-macros = { workspace = true, optional = true } -sqlx-mysql = { workspace = true, optional = true } sqlx-postgres = { workspace = true, optional = true } -sqlx-sqlite = { workspace = true, optional = true } [dev-dependencies] anyhow = "1.0.52" @@ -177,9 +173,6 @@ hex = "0.4.3" tempfile = "3.9.0" criterion = { version = "0.5.1", features = ["async_tokio"] } -# Needed to test SQLCipher -libsqlite3-sys = { version = "0.27", features = ["bundled-sqlcipher"] } - # # Any # From ca1f617a959cb1706b27719c6c8368c2605e4a5a Mon Sep 17 00:00:00 2001 From: KellianDev Date: Tue, 6 Feb 2024 10:42:44 +0100 Subject: [PATCH 4/5] remove all reference to sqlite and mysql in s --- Cargo.lock | 272 +----------------------------------- Cargo.toml | 119 +--------------- sqlx-cli/Cargo.toml | 4 +- sqlx-core/Cargo.toml | 2 +- sqlx-macros-core/Cargo.toml | 16 +-- sqlx-macros/Cargo.toml | 2 - 6 files changed, 14 insertions(+), 401 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 56cde771a9..2ccbecd41a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -505,9 +505,6 @@ name = "bitflags" version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" -dependencies = [ - "serde", -] [[package]] name = "bitvec" @@ -837,12 +834,6 @@ dependencies = [ "windows-sys 0.45.0", ] -[[package]] -name = "const-oid" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" - [[package]] name = "core-foundation" version = "0.9.3" @@ -1034,17 +1025,6 @@ dependencies = [ "syn 2.0.39", ] -[[package]] -name = "der" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" -dependencies = [ - "const-oid", - "pem-rfc7468", - "zeroize", -] - [[package]] name = "deranged" version = "0.3.9" @@ -1068,7 +1048,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", - "const-oid", "crypto-common", "subtle", ] @@ -1282,17 +1261,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "futures-core", - "futures-sink", - "spin 0.9.8", -] - [[package]] name = "fnv" version = "1.0.7" @@ -1841,9 +1809,6 @@ name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -dependencies = [ - "spin 0.5.2", -] [[package]] name = "libc" @@ -1851,12 +1816,6 @@ version = "0.2.152" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - [[package]] name = "libredox" version = "0.0.1" @@ -1868,17 +1827,6 @@ dependencies = [ "redox_syscall 0.4.1", ] -[[package]] -name = "libsqlite3-sys" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - [[package]] name = "linux-raw-sys" version = "0.3.8" @@ -2109,23 +2057,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-bigint-dig" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" -dependencies = [ - "byteorder", - "lazy_static", - "libm", - "num-integer", - "num-iter", - "num-traits", - "rand", - "smallvec", - "zeroize", -] - [[package]] name = "num-integer" version = "0.1.45" @@ -2136,17 +2067,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - [[package]] name = "num-traits" version = "0.2.17" @@ -2154,7 +2074,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", - "libm", ] [[package]] @@ -2288,15 +2207,6 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" -[[package]] -name = "pem-rfc7468" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" -dependencies = [ - "base64ct", -] - [[package]] name = "percent-encoding" version = "2.3.1" @@ -2346,27 +2256,6 @@ dependencies = [ "futures-io", ] -[[package]] -name = "pkcs1" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" -dependencies = [ - "der", - "pkcs8", - "spki", -] - -[[package]] -name = "pkcs8" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -dependencies = [ - "der", - "spki", -] - [[package]] name = "pkg-config" version = "0.3.27" @@ -2702,7 +2591,7 @@ dependencies = [ "cc", "getrandom", "libc", - "spin 0.9.8", + "spin", "untrusted", "windows-sys 0.48.0", ] @@ -2735,26 +2624,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "rsa" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a3211b01eea83d80687da9eef70e39d65144a3894866a5153a2723e425a157f" -dependencies = [ - "const-oid", - "digest", - "num-bigint-dig", - "num-integer", - "num-traits", - "pkcs1", - "pkcs8", - "rand_core", - "signature", - "spki", - "subtle", - "zeroize", -] - [[package]] name = "rust_decimal" version = "1.33.1" @@ -3059,16 +2928,6 @@ dependencies = [ "libc", ] -[[package]] -name = "signature" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" -dependencies = [ - "digest", - "rand_core", -] - [[package]] name = "simdutf8" version = "0.1.4" @@ -3110,30 +2969,11 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - [[package]] name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - -[[package]] -name = "spki" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" -dependencies = [ - "base64ct", - "der", -] [[package]] name = "sqlformat" @@ -3157,7 +2997,6 @@ dependencies = [ "env_logger", "futures", "hex", - "libsqlite3-sys", "paste", "rand", "rand_xoshiro", @@ -3165,9 +3004,7 @@ dependencies = [ "serde_json", "sqlx-core", "sqlx-macros", - "sqlx-mysql", "sqlx-postgres", - "sqlx-sqlite", "sqlx-test", "tempfile", "time", @@ -3260,17 +3097,6 @@ dependencies = [ "webpki-roots", ] -[[package]] -name = "sqlx-example-mysql-todos" -version = "0.1.0" -dependencies = [ - "anyhow", - "futures", - "sqlx", - "structopt", - "tokio", -] - [[package]] name = "sqlx-example-postgres-axum-social" version = "0.1.0" @@ -3375,17 +3201,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "sqlx-example-sqlite-todos" -version = "0.1.0" -dependencies = [ - "anyhow", - "futures", - "sqlx", - "structopt", - "tokio", -] - [[package]] name = "sqlx-macros" version = "0.7.3" @@ -3414,60 +3229,13 @@ dependencies = [ "serde_json", "sha2", "sqlx-core", - "sqlx-mysql", "sqlx-postgres", - "sqlx-sqlite", "syn 1.0.109", "tempfile", "tokio", "url", ] -[[package]] -name = "sqlx-mysql" -version = "0.7.3" -dependencies = [ - "atoi", - "base64 0.21.5", - "bigdecimal", - "bitflags 2.4.1", - "byteorder", - "bytes", - "chrono", - "crc", - "digest", - "dotenvy", - "either", - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "generic-array", - "hex", - "hkdf", - "hmac", - "itoa", - "log", - "md-5", - "memchr", - "once_cell", - "percent-encoding", - "rand", - "rsa", - "rust_decimal", - "serde", - "sha1", - "sha2", - "smallvec", - "sqlx-core", - "stringprep", - "thiserror", - "time", - "tracing", - "uuid", - "whoami", -] - [[package]] name = "sqlx-postgres" version = "0.7.3" @@ -3514,32 +3282,6 @@ dependencies = [ "whoami", ] -[[package]] -name = "sqlx-sqlite" -version = "0.7.3" -dependencies = [ - "atoi", - "chrono", - "flume", - "futures-channel", - "futures-core", - "futures-executor", - "futures-intrusive", - "futures-util", - "libsqlite3-sys", - "log", - "percent-encoding", - "regex", - "serde", - "sqlx", - "sqlx-core", - "time", - "tracing", - "url", - "urlencoding", - "uuid", -] - [[package]] name = "sqlx-test" version = "0.1.0" @@ -4001,12 +3743,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "urlencoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" - [[package]] name = "utf8parse" version = "0.2.1" @@ -4491,9 +4227,3 @@ dependencies = [ "quote", "syn 2.0.39", ] - -[[package]] -name = "zeroize" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" diff --git a/Cargo.toml b/Cargo.toml index a72df221a0..18d8f37fd7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,10 +7,7 @@ members = [ "sqlx-test", "sqlx-cli", # "sqlx-bench", - "sqlx-mysql", "sqlx-postgres", - "sqlx-sqlite", - "examples/mysql/todos", "examples/postgres/axum-social-with-tests", "examples/postgres/chat", "examples/postgres/files", @@ -18,8 +15,7 @@ members = [ "examples/postgres/listen", "examples/postgres/todos", "examples/postgres/mockable-todos", - "examples/postgres/transaction", - "examples/sqlite/todos", + "examples/postgres/transaction" ] [workspace.package] @@ -27,7 +23,7 @@ version = "0.7.3" license = "MIT OR Apache-2.0" edition = "2021" repository = "https://github.com/launchbadge/sqlx" -keywords = ["database", "async", "postgres", "mysql", "sqlite"] +keywords = ["database", "async", "postgres"] categories = ["database", "asynchronous"] authors = [ "Ryan Leckey ", @@ -54,10 +50,10 @@ rustdoc-args = ["--cfg", "docsrs"] [features] default = ["any", "macros", "migrate", "json"] macros = ["sqlx-macros"] -migrate = ["sqlx-core/migrate", "sqlx-macros?/migrate", "sqlx-mysql?/migrate", "sqlx-postgres?/migrate", "sqlx-sqlite?/migrate"] +migrate = ["sqlx-core/migrate", "sqlx-macros?/migrate", "sqlx-postgres?/migrate"] # intended mainly for CI and docs -all-databases = ["mysql", "sqlite", "postgres", "any"] +all-databases = ["postgres", "any"] _unstable-all-types = [ "bigdecimal", "rust_decimal", @@ -94,10 +90,8 @@ _rt-async-std = [] _rt-tokio = [] # database -any = ["sqlx-core/any", "sqlx-mysql?/any", "sqlx-postgres?/any", "sqlx-sqlite?/any"] +any = ["sqlx-core/any", "sqlx-postgres?/any"] postgres = ["sqlx-postgres", "sqlx-macros?/postgres"] -mysql = ["sqlx-mysql", "sqlx-macros?/mysql"] -sqlite = ["sqlx-sqlite", "sqlx-macros?/sqlite"] # types json = ["sqlx-macros?/json", "sqlx-postgres?/json"] @@ -196,109 +190,6 @@ name = "migrate-macro" path = "tests/migrate/macro.rs" required-features = ["macros", "migrate"] -# -# SQLite -# - -[[test]] -name = "sqlite" -path = "tests/sqlite/sqlite.rs" -required-features = ["sqlite"] - -[[test]] -name = "sqlite-any" -path = "tests/sqlite/any.rs" -required-features = ["sqlite"] - -[[test]] -name = "sqlite-types" -path = "tests/sqlite/types.rs" -required-features = ["sqlite"] - -[[test]] -name = "sqlite-describe" -path = "tests/sqlite/describe.rs" -required-features = ["sqlite"] - -[[test]] -name = "sqlite-macros" -path = "tests/sqlite/macros.rs" -required-features = ["sqlite", "macros"] - -[[test]] -name = "sqlite-derives" -path = "tests/sqlite/derives.rs" -required-features = ["sqlite", "macros"] - -[[test]] -name = "sqlite-error" -path = "tests/sqlite/error.rs" -required-features = ["sqlite"] - -[[test]] -name = "sqlite-sqlcipher" -path = "tests/sqlite/sqlcipher.rs" -required-features = ["sqlite"] - -[[test]] -name = "sqlite-test-attr" -path = "tests/sqlite/test-attr.rs" -required-features = ["sqlite", "macros", "migrate"] - -[[test]] -name = "sqlite-migrate" -path = "tests/sqlite/migrate.rs" -required-features = ["sqlite", "macros", "migrate"] - -[[bench]] -name = "sqlite-describe" -path = "benches/sqlite/describe.rs" -harness = false -required-features = ["sqlite"] - -# -# MySQL -# - -[[test]] -name = "mysql" -path = "tests/mysql/mysql.rs" -required-features = ["mysql"] - -[[test]] -name = "mysql-types" -path = "tests/mysql/types.rs" -required-features = ["mysql"] - -[[test]] -name = "mysql-describe" -path = "tests/mysql/describe.rs" -required-features = ["mysql"] - -[[test]] -name = "mysql-macros" -path = "tests/mysql/macros.rs" -required-features = ["mysql", "macros"] - -[[test]] -name = "mysql-error" -path = "tests/mysql/error.rs" -required-features = ["mysql"] - -[[test]] -name = "mysql-test-attr" -path = "tests/mysql/test-attr.rs" -required-features = ["mysql", "macros", "migrate"] - -[[test]] -name = "mysql-migrate" -path = "tests/mysql/migrate.rs" -required-features = ["mysql", "macros", "migrate"] - -# -# PostgreSQL -# - [[test]] name = "postgres" path = "tests/postgres/postgres.rs" diff --git a/sqlx-cli/Cargo.toml b/sqlx-cli/Cargo.toml index 80de8e150d..664d681711 100644 --- a/sqlx-cli/Cargo.toml +++ b/sqlx-cli/Cargo.toml @@ -51,14 +51,12 @@ filetime = "0.2" backoff = { version = "0.4.0", features = ["futures", "tokio"] } [features] -default = ["postgres", "sqlite", "mysql", "native-tls", "completions"] +default = ["postgres", "native-tls", "completions"] rustls = ["sqlx/runtime-tokio-rustls"] native-tls = ["sqlx/runtime-tokio-native-tls"] # databases -mysql = ["sqlx/mysql"] postgres = ["sqlx/postgres"] -sqlite = ["sqlx/sqlite"] # workaround for musl + openssl issues openssl-vendored = ["openssl/vendored"] diff --git a/sqlx-core/Cargo.toml b/sqlx-core/Cargo.toml index 5d08010ee1..c9958deb88 100644 --- a/sqlx-core/Cargo.toml +++ b/sqlx-core/Cargo.toml @@ -90,5 +90,5 @@ indexmap = "2.0" event-listener = "2.5.2" [dev-dependencies] -sqlx = { workspace = true, features = ["postgres", "sqlite", "mysql", "migrate", "macros", "time", "uuid"] } +sqlx = { workspace = true, features = ["postgres", "migrate", "macros", "time", "uuid"] } tokio = { version = "1", features = ["rt"] } diff --git a/sqlx-macros-core/Cargo.toml b/sqlx-macros-core/Cargo.toml index 53fadd21c0..0b051556f3 100644 --- a/sqlx-macros-core/Cargo.toml +++ b/sqlx-macros-core/Cargo.toml @@ -21,27 +21,23 @@ _tls-rustls = ["sqlx-core/_tls-rustls"] migrate = ["sqlx-core/migrate"] # database -mysql = ["sqlx-mysql"] postgres = ["sqlx-postgres"] -sqlite = ["sqlx-sqlite"] # type integrations -json = ["sqlx-core/json", "sqlx-mysql?/json", "sqlx-sqlite?/json"] +json = ["sqlx-core/json"] -bigdecimal = ["sqlx-core/bigdecimal", "sqlx-mysql?/bigdecimal", "sqlx-postgres?/bigdecimal"] +bigdecimal = ["sqlx-core/bigdecimal", "sqlx-postgres?/bigdecimal"] bit-vec = ["sqlx-core/bit-vec", "sqlx-postgres?/bit-vec"] -chrono = ["sqlx-core/chrono", "sqlx-mysql?/chrono", "sqlx-postgres?/chrono", "sqlx-sqlite?/chrono"] +chrono = ["sqlx-core/chrono", "sqlx-postgres?/chrono"] ipnetwork = ["sqlx-core/ipnetwork", "sqlx-postgres?/ipnetwork"] mac_address = ["sqlx-core/mac_address", "sqlx-postgres?/mac_address"] -rust_decimal = ["sqlx-core/rust_decimal", "sqlx-mysql?/rust_decimal", "sqlx-postgres?/rust_decimal"] -time = ["sqlx-core/time", "sqlx-mysql?/time", "sqlx-postgres?/time", "sqlx-sqlite?/time"] -uuid = ["sqlx-core/uuid", "sqlx-mysql?/uuid", "sqlx-postgres?/uuid", "sqlx-sqlite?/uuid"] +rust_decimal = ["sqlx-core/rust_decimal", "sqlx-postgres?/rust_decimal"] +time = ["sqlx-core/time", "sqlx-postgres?/time"] +uuid = ["sqlx-core/uuid", "sqlx-postgres?/uuid"] [dependencies] sqlx-core = { workspace = true, features = ["offline"] } -sqlx-mysql = { workspace = true, features = ["offline", "migrate"], optional = true } sqlx-postgres = { workspace = true, features = ["offline", "migrate"], optional = true } -sqlx-sqlite = { workspace = true, features = ["offline", "migrate"], optional = true } async-std = { workspace = true, optional = true } tokio = { workspace = true, optional = true } diff --git a/sqlx-macros/Cargo.toml b/sqlx-macros/Cargo.toml index 82fecab730..19626ad163 100644 --- a/sqlx-macros/Cargo.toml +++ b/sqlx-macros/Cargo.toml @@ -24,9 +24,7 @@ _tls-rustls = ["sqlx-macros-core/_tls-rustls"] migrate = ["sqlx-macros-core/migrate"] # database -mysql = ["sqlx-macros-core/mysql"] postgres = ["sqlx-macros-core/postgres"] -sqlite = ["sqlx-macros-core/sqlite"] # type bigdecimal = ["sqlx-macros-core/bigdecimal"] From 4004173cbd51e24d0b6ff918403ad648d5b3386d Mon Sep 17 00:00:00 2001 From: KellianDev Date: Tue, 9 Apr 2024 16:03:36 +0400 Subject: [PATCH 5/5] Update Cargo.toml --- sqlx-core/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sqlx-core/Cargo.toml b/sqlx-core/Cargo.toml index c9958deb88..564c84036f 100644 --- a/sqlx-core/Cargo.toml +++ b/sqlx-core/Cargo.toml @@ -51,7 +51,7 @@ uuid = { workspace = true, optional = true } async-io = { version = "1.9.0", optional = true } paste = "1.0.6" -ahash = "0.8.7" +ahash = "0.8.5" atoi = "2.0" bytes = "1.1.0"