Skip to content

Commit 6c90493

Browse files
committed
revert Cargo.toml
1 parent 4fd03ec commit 6c90493

File tree

1 file changed

+30
-118
lines changed

1 file changed

+30
-118
lines changed

Cargo.toml

Lines changed: 30 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -64,20 +64,10 @@ default = ["any", "macros", "migrate", "json"]
6464

6565
derive = ["sqlx-macros/derive"]
6666
macros = ["derive", "sqlx-macros/macros"]
67-
migrate = [
68-
"sqlx-core/migrate",
69-
"sqlx-macros?/migrate",
70-
"sqlx-mysql?/migrate",
71-
"sqlx-postgres?/migrate",
72-
"sqlx-sqlite?/migrate",
73-
]
67+
migrate = ["sqlx-core/migrate", "sqlx-macros?/migrate", "sqlx-mysql?/migrate", "sqlx-postgres?/migrate", "sqlx-sqlite?/migrate"]
7468

7569
# Enable parsing of `sqlx.toml` for configuring macros and migrations.
76-
sqlx-toml = [
77-
"sqlx-core/sqlx-toml",
78-
"sqlx-macros?/sqlx-toml",
79-
"sqlx-sqlite?/sqlx-toml",
80-
]
70+
sqlx-toml = ["sqlx-core/sqlx-toml", "sqlx-macros?/sqlx-toml", "sqlx-sqlite?/sqlx-toml"]
8171

8272
# intended mainly for CI and docs
8373
all-databases = ["mysql", "sqlite", "postgres", "any"]
@@ -92,40 +82,27 @@ _unstable-all-types = [
9282
"mac_address",
9383
"uuid",
9484
"bit-vec",
95-
"bstr",
85+
"bstr"
9686
]
9787

9888
# Render documentation that wouldn't otherwise be shown (e.g. `sqlx_core::config`).
9989
_unstable-docs = [
10090
"all-databases",
10191
"_unstable-all-types",
102-
"sqlx-sqlite/_unstable-docs",
92+
"sqlx-sqlite/_unstable-docs"
10393
]
10494

10595
# Base runtime features without TLS
106-
runtime-async-std = [
107-
"_rt-async-std",
108-
"sqlx-core/_rt-async-std",
109-
"sqlx-macros?/_rt-async-std",
110-
]
96+
runtime-async-std = ["_rt-async-std", "sqlx-core/_rt-async-std", "sqlx-macros?/_rt-async-std"]
11197
runtime-tokio = ["_rt-tokio", "sqlx-core/_rt-tokio", "sqlx-macros?/_rt-tokio"]
11298

11399
# TLS features
114100
tls-native-tls = ["sqlx-core/_tls-native-tls", "sqlx-macros?/_tls-native-tls"]
115101
tls-rustls = ["tls-rustls-ring"] # For backwards compatibility
116-
tls-rustls-aws-lc-rs = [
117-
"sqlx-core/_tls-rustls-aws-lc-rs",
118-
"sqlx-macros?/_tls-rustls-aws-lc-rs",
119-
]
102+
tls-rustls-aws-lc-rs = ["sqlx-core/_tls-rustls-aws-lc-rs", "sqlx-macros?/_tls-rustls-aws-lc-rs"]
120103
tls-rustls-ring = ["tls-rustls-ring-webpki"] # For backwards compatibility
121-
tls-rustls-ring-webpki = [
122-
"sqlx-core/_tls-rustls-ring-webpki",
123-
"sqlx-macros?/_tls-rustls-ring-webpki",
124-
]
125-
tls-rustls-ring-native-roots = [
126-
"sqlx-core/_tls-rustls-ring-native-roots",
127-
"sqlx-macros?/_tls-rustls-ring-native-roots",
128-
]
104+
tls-rustls-ring-webpki = ["sqlx-core/_tls-rustls-ring-webpki", "sqlx-macros?/_tls-rustls-ring-webpki"]
105+
tls-rustls-ring-native-roots = ["sqlx-core/_tls-rustls-ring-native-roots", "sqlx-macros?/_tls-rustls-ring-native-roots"]
129106

130107
# No-op feature used by the workflows to compile without TLS enabled. Not meant for general use.
131108
tls-none = []
@@ -136,28 +113,14 @@ _rt-tokio = []
136113
_sqlite = []
137114

138115
# database
139-
any = [
140-
"sqlx-core/any",
141-
"sqlx-mysql?/any",
142-
"sqlx-postgres?/any",
143-
"sqlx-sqlite?/any",
144-
]
116+
any = ["sqlx-core/any", "sqlx-mysql?/any", "sqlx-postgres?/any", "sqlx-sqlite?/any"]
145117
postgres = ["sqlx-postgres", "sqlx-macros?/postgres"]
146118
mysql = ["sqlx-mysql", "sqlx-macros?/mysql"]
147-
sqlite = [
148-
"sqlite-bundled",
149-
"sqlite-deserialize",
150-
"sqlite-load-extension",
151-
"sqlite-unlock-notify",
152-
]
119+
sqlite = ["sqlite-bundled", "sqlite-deserialize", "sqlite-load-extension", "sqlite-unlock-notify"]
153120

154121
# SQLite base features
155122
sqlite-bundled = ["_sqlite", "sqlx-sqlite/bundled", "sqlx-macros?/sqlite"]
156-
sqlite-unbundled = [
157-
"_sqlite",
158-
"sqlx-sqlite/unbundled",
159-
"sqlx-macros?/sqlite-unbundled",
160-
]
123+
sqlite-unbundled = ["_sqlite", "sqlx-sqlite/unbundled", "sqlx-macros?/sqlite-unbundled"]
161124

162125
# SQLite features using conditionally compiled APIs
163126
# Note: these assume `sqlite-bundled` or `sqlite-unbundled` is also enabled
@@ -169,10 +132,7 @@ sqlite-deserialize = ["sqlx-sqlite/deserialize"]
169132
# Enable `SqliteConnectOptions::extension()` and `::extension_with_entrypoint()`.
170133
# Also required to use `drivers.sqlite.unsafe-load-extensions` from `sqlx.toml`.
171134
# Cannot be used with `-DSQLITE_OMIT_LOAD_EXTENSION`
172-
sqlite-load-extension = [
173-
"sqlx-sqlite/load-extension",
174-
"sqlx-macros?/sqlite-load-extension",
175-
]
135+
sqlite-load-extension = ["sqlx-sqlite/load-extension", "sqlx-macros?/sqlite-load-extension"]
176136

177137
# Enables `sqlite3_preupdate_hook`
178138
# Requires `-DSQLITE_ENABLE_PREUPDATE_HOOK` (set automatically with `sqlite-bundled`)
@@ -183,63 +143,17 @@ sqlite-preupdate-hook = ["sqlx-sqlite/preupdate-hook"]
183143
sqlite-unlock-notify = ["sqlx-sqlite/unlock-notify"]
184144

185145
# types
186-
json = [
187-
"sqlx-core/json",
188-
"sqlx-macros?/json",
189-
"sqlx-mysql?/json",
190-
"sqlx-postgres?/json",
191-
"sqlx-sqlite?/json",
192-
]
146+
json = ["sqlx-core/json", "sqlx-macros?/json", "sqlx-mysql?/json", "sqlx-postgres?/json", "sqlx-sqlite?/json"]
193147

194-
bigdecimal = [
195-
"sqlx-core/bigdecimal",
196-
"sqlx-macros?/bigdecimal",
197-
"sqlx-mysql?/bigdecimal",
198-
"sqlx-postgres?/bigdecimal",
199-
]
200-
bit-vec = [
201-
"sqlx-core/bit-vec",
202-
"sqlx-macros?/bit-vec",
203-
"sqlx-postgres?/bit-vec",
204-
]
205-
chrono = [
206-
"sqlx-core/chrono",
207-
"sqlx-macros?/chrono",
208-
"sqlx-mysql?/chrono",
209-
"sqlx-postgres?/chrono",
210-
"sqlx-sqlite?/chrono",
211-
]
148+
bigdecimal = ["sqlx-core/bigdecimal", "sqlx-macros?/bigdecimal", "sqlx-mysql?/bigdecimal", "sqlx-postgres?/bigdecimal"]
149+
bit-vec = ["sqlx-core/bit-vec", "sqlx-macros?/bit-vec", "sqlx-postgres?/bit-vec"]
150+
chrono = ["sqlx-core/chrono", "sqlx-macros?/chrono", "sqlx-mysql?/chrono", "sqlx-postgres?/chrono", "sqlx-sqlite?/chrono"]
212151
ipnet = ["sqlx-core/ipnet", "sqlx-macros?/ipnet", "sqlx-postgres?/ipnet"]
213-
ipnetwork = [
214-
"sqlx-core/ipnetwork",
215-
"sqlx-macros?/ipnetwork",
216-
"sqlx-postgres?/ipnetwork",
217-
]
218-
mac_address = [
219-
"sqlx-core/mac_address",
220-
"sqlx-macros?/mac_address",
221-
"sqlx-postgres?/mac_address",
222-
]
223-
rust_decimal = [
224-
"sqlx-core/rust_decimal",
225-
"sqlx-macros?/rust_decimal",
226-
"sqlx-mysql?/rust_decimal",
227-
"sqlx-postgres?/rust_decimal",
228-
]
229-
time = [
230-
"sqlx-core/time",
231-
"sqlx-macros?/time",
232-
"sqlx-mysql?/time",
233-
"sqlx-postgres?/time",
234-
"sqlx-sqlite?/time",
235-
]
236-
uuid = [
237-
"sqlx-core/uuid",
238-
"sqlx-macros?/uuid",
239-
"sqlx-mysql?/uuid",
240-
"sqlx-postgres?/uuid",
241-
"sqlx-sqlite?/uuid",
242-
]
152+
ipnetwork = ["sqlx-core/ipnetwork", "sqlx-macros?/ipnetwork", "sqlx-postgres?/ipnetwork"]
153+
mac_address = ["sqlx-core/mac_address", "sqlx-macros?/mac_address", "sqlx-postgres?/mac_address"]
154+
rust_decimal = ["sqlx-core/rust_decimal", "sqlx-macros?/rust_decimal", "sqlx-mysql?/rust_decimal", "sqlx-postgres?/rust_decimal"]
155+
time = ["sqlx-core/time", "sqlx-macros?/time", "sqlx-mysql?/time", "sqlx-postgres?/time", "sqlx-sqlite?/time"]
156+
uuid = ["sqlx-core/uuid", "sqlx-macros?/uuid", "sqlx-mysql?/uuid", "sqlx-postgres?/uuid", "sqlx-sqlite?/uuid"]
243157
regexp = ["sqlx-sqlite?/regexp"]
244158
bstr = ["sqlx-core/bstr"]
245159

@@ -261,16 +175,11 @@ sqlx = { version = "=0.9.0-alpha.1", path = "." }
261175
# These are optional unless enabled in a workspace crate.
262176
bigdecimal = "0.4.0"
263177
bit-vec = "0.6.3"
264-
chrono = { version = "0.4.34", default-features = false, features = [
265-
"std",
266-
"clock",
267-
] }
178+
chrono = { version = "0.4.34", default-features = false, features = ["std", "clock"] }
268179
ipnet = "2.3.0"
269180
ipnetwork = "0.21.1"
270181
mac_address = "1.1.5"
271-
rust_decimal = { version = "1.26.1", default-features = false, features = [
272-
"std",
273-
] }
182+
rust_decimal = { version = "1.26.1", default-features = false, features = ["std"] }
274183
time = { version = "0.3.36", features = ["formatting", "parsing", "macros"] }
275184
uuid = "1.1.2"
276185

@@ -297,9 +206,7 @@ sqlx-sqlite = { workspace = true, optional = true }
297206
[dev-dependencies]
298207
anyhow = "1.0.52"
299208
time_ = { version = "0.3.2", package = "time" }
300-
futures-util = { version = "0.3.19", default-features = false, features = [
301-
"alloc",
302-
] }
209+
futures-util = { version = "0.3.19", default-features = false, features = ["alloc"] }
303210
env_logger = "0.11"
304211
async-std = { workspace = true, features = ["attributes"] }
305212
tokio = { version = "1.15.0", features = ["full"] }
@@ -392,7 +299,12 @@ required-features = ["sqlite"]
392299
[[test]]
393300
name = "sqlite-macros"
394301
path = "tests/sqlite/macros.rs"
395-
required-features = ["_sqlite", "macros"]
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"]
396308

397309
[[test]]
398310
name = "sqlite-derives"

0 commit comments

Comments
 (0)