From 99ec41913ceca7b898d2e809a566d947bc19b7c2 Mon Sep 17 00:00:00 2001 From: iamjpotts <8704475+iamjpotts@users.noreply.github.com> Date: Mon, 25 Aug 2025 18:28:11 -0400 Subject: [PATCH] refactor(sqlite): Resolve duplicate test target warning for macros.rs (#3988) * refactor(sqlite): Resolve duplicate test target warning for macros.rs Signed-off-by: Joshua Potts <8704475+iamjpotts@users.noreply.github.com> * refactor(sqlite): For macros tests, use _sqlite pseudo feature instead of #![cfg(...)] in the module Signed-off-by: Joshua Potts <8704475+iamjpotts@users.noreply.github.com> --------- Signed-off-by: Joshua Potts <8704475+iamjpotts@users.noreply.github.com> --- .github/workflows/sqlx.yml | 4 ++-- Cargo.toml | 7 +------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/sqlx.yml b/.github/workflows/sqlx.yml index 05d5da0a..f5de3970 100644 --- a/.github/workflows/sqlx.yml +++ b/.github/workflows/sqlx.yml @@ -181,7 +181,7 @@ jobs: - run: > cargo build --no-default-features - --test ${{ matrix.linking }}-macros + --test sqlite-macros --features any,macros,${{ matrix.linking }},_unstable-all-types,runtime-${{ matrix.runtime }} env: SQLX_OFFLINE: true @@ -193,7 +193,7 @@ jobs: - run: > cargo test --no-default-features - --test ${{ matrix.linking }}-macros + --test sqlite-macros --features any,macros,${{ matrix.linking }},_unstable-all-types,runtime-${{ matrix.runtime }} env: DATABASE_URL: sqlite://tests/sqlite/sqlite.db diff --git a/Cargo.toml b/Cargo.toml index 9c37eb4a..e8279e31 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -299,12 +299,7 @@ required-features = ["sqlite"] [[test]] name = "sqlite-macros" path = "tests/sqlite/macros.rs" -required-features = ["sqlite", "macros"] - -[[test]] -name = "sqlite-unbundled-macros" -path = "tests/sqlite/macros.rs" -required-features = ["sqlite-unbundled", "macros"] +required-features = ["_sqlite", "macros"] [[test]] name = "sqlite-derives"