From 8bbec08a311d36ab2820625fd900e2d9dbba8ce3 Mon Sep 17 00:00:00 2001 From: koeninger-ironlight Date: Tue, 23 Apr 2024 16:04:09 -0500 Subject: [PATCH] workaround for https://github.com/launchbadge/sqlx/issues/3211 --- Cargo.toml | 17 +++++++++-------- sqlx-macros-core/Cargo.toml | 12 ++++++------ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 3602792d12..bbe4befc2e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -53,8 +53,9 @@ 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"] @@ -94,22 +95,22 @@ _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-mysql?/json", "sqlx-postgres?/json", "sqlx-sqlite?/json"] +json = ["sqlx-macros?/json", "sqlx-postgres?/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"] +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 = ["sqlx-sqlite?/regexp"] [workspace.dependencies] diff --git a/sqlx-macros-core/Cargo.toml b/sqlx-macros-core/Cargo.toml index 48e8d26491..b8018467e3 100644 --- a/sqlx-macros-core/Cargo.toml +++ b/sqlx-macros-core/Cargo.toml @@ -26,16 +26,16 @@ 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"] }