Skip to content

Commit f1ee6df

Browse files
committed
refactor(sqlite): Resolve duplicate test target warning for macros.rs
Signed-off-by: Joshua Potts <[email protected]>
1 parent a301d9a commit f1ee6df

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

.github/workflows/sqlx.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ jobs:
181181
- run: >
182182
cargo build
183183
--no-default-features
184-
--test ${{ matrix.linking }}-macros
184+
--test sqlite-macros
185185
--features any,macros,${{ matrix.linking }},_unstable-all-types,runtime-${{ matrix.runtime }}
186186
env:
187187
SQLX_OFFLINE: true
@@ -193,7 +193,7 @@ jobs:
193193
- run: >
194194
cargo test
195195
--no-default-features
196-
--test ${{ matrix.linking }}-macros
196+
--test sqlite-macros
197197
--features any,macros,${{ matrix.linking }},_unstable-all-types,runtime-${{ matrix.runtime }}
198198
env:
199199
DATABASE_URL: sqlite://tests/sqlite/sqlite.db

Cargo.toml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -299,12 +299,7 @@ required-features = ["sqlite"]
299299
[[test]]
300300
name = "sqlite-macros"
301301
path = "tests/sqlite/macros.rs"
302-
required-features = ["sqlite", "macros"]
303-
304-
[[test]]
305-
name = "sqlite-unbundled-macros"
306-
path = "tests/sqlite/macros.rs"
307-
required-features = ["sqlite-unbundled", "macros"]
302+
required-features = ["macros"] # Also requires either sqlite or sqlite-unbundled
308303

309304
[[test]]
310305
name = "sqlite-derives"

tests/sqlite/macros.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#![cfg(any(feature = "sqlite", feature = "sqlite-unbundled"))]
2+
13
use sqlx::Sqlite;
24
use sqlx_test::new;
35

0 commit comments

Comments
 (0)