Skip to content

Commit 946b6d4

Browse files
committed
fix: break dev-dependency cycle because of rust-lang/cargo#15622
1 parent 1b2b19f commit 946b6d4

File tree

4 files changed

+18
-5
lines changed

4 files changed

+18
-5
lines changed

sqlx-core/Cargo.toml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,14 @@ hashbrown = "0.16.0"
106106
thiserror.workspace = true
107107

108108
[dev-dependencies]
109-
sqlx = { workspace = true, features = ["postgres", "sqlite", "mysql", "migrate", "macros", "time", "uuid"] }
110109
tokio = { version = "1", features = ["rt"] }
111110

111+
[dev-dependencies.sqlx]
112+
# FIXME: https://github.com/rust-lang/cargo/issues/15622
113+
# workspace = true
114+
path = ".."
115+
default-features = false
116+
features = ["postgres", "sqlite", "mysql", "migrate", "macros", "time", "uuid"]
117+
112118
[lints]
113119
workspace = true

sqlx-mysql/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ thiserror.workspace = true
7373
serde = { version = "1.0.144", optional = true }
7474

7575
[dev-dependencies]
76-
sqlx = { workspace = true, features = ["mysql"] }
76+
# FIXME: https://github.com/rust-lang/cargo/issues/15622
77+
sqlx = { path = "..", default-features = false, features = ["mysql"] }
7778

7879
[lints]
7980
workspace = true

sqlx-postgres/Cargo.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,9 @@ workspace = true
7979
features = ["json"]
8080

8181
[dev-dependencies.sqlx]
82-
workspace = true
82+
# FIXME: https://github.com/rust-lang/cargo/issues/15622
83+
# workspace = true
84+
path = ".."
8385
features = ["postgres", "derive"]
8486

8587
[target.'cfg(target_os = "windows")'.dependencies]

sqlx-sqlite/Cargo.toml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,12 @@ regex = { version = "1.5.5", optional = true }
9494
[dependencies.sqlx-core]
9595
workspace = true
9696

97-
[dev-dependencies]
98-
sqlx = { workspace = true, features = ["macros", "runtime-tokio", "tls-none", "sqlite"] }
97+
[dev-dependencies.sqlx]
98+
# FIXME: https://github.com/rust-lang/cargo/issues/15622
99+
# workspace = true
100+
path = ".."
101+
default-features = false
102+
features = ["macros", "runtime-tokio", "tls-none", "sqlite"]
99103

100104
[lints]
101105
workspace = true

0 commit comments

Comments
 (0)