Skip to content

Commit 9079720

Browse files
authored
groundwork for 0.9.0-alpha.1 (#3821)
* chore: bump version to `0.9.0-alpha.1` * chore: delete unused `sqlx-bench` package * chore: set `rust-version` to 1.85 for all crates * fix: lots of new Clippy warnings * fix: lots more Clippy warnings * fix(cli): add `_sqlite` feature * fix: lots, *lots* more Clippy warnings * fix(core): warning in `tls_rustls` * breaking: delete runtime+TLS combination features * chore: don't re-export unstable `TransactionManager` trait * chore: 0.9.0-alplha.1 CHANGELOG * chore: increase MSRV further to 1.86 * fix: more clippy warnings
1 parent bab1b02 commit 9079720

File tree

94 files changed

+213
-1265
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+213
-1265
lines changed

CHANGELOG.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,25 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## 0.9.0-alpha.1 - 2025-05-19
9+
10+
Accumulated changes since the beginning of the alpha cycle. Effectively a draft CHANGELOG for the 0.9.0 release.
11+
12+
This section will be replaced in subsequent alpha releases. See the Git history of this file for previous alphas.
13+
14+
### Breaking
15+
16+
* [[#3821]] Groundwork for 0.9.0-alpha.1
17+
* Increased MSRV to 1.86 and set rust-version [@abonander]
18+
* Deleted deprecated combination runtime+TLS features (e.g. `runtime-tokio-native-tls`)
19+
* Deleted re-export of unstable `TransactionManager` trait in `sqlx`.
20+
* Not technically a breaking change because it's `#[doc(hidden)]`,
21+
but [it _will_ break SeaORM][seaorm-2600] if not proactively fixed.
22+
23+
[seaorm-2600]: https://github.com/SeaQL/sea-orm/issues/2600
24+
25+
[#3821]: https://github.com/launchbadge/sqlx/pull/3830
26+
827
## 0.8.6 - 2025-05-19
928

1029
9 pull requests were merged this release cycle.

Cargo.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ members = [
2323
]
2424

2525
[workspace.package]
26-
version = "0.8.6"
26+
version = "0.9.0-alpha.1"
2727
license = "MIT OR Apache-2.0"
28+
# TODO: upgrade to edition 2024 (after merging all pending PRs)
2829
edition = "2021"
2930
repository = "https://github.com/launchbadge/sqlx"
3031
keywords = ["database", "async", "postgres", "mysql", "sqlite"]
@@ -35,8 +36,7 @@ authors = [
3536
"Chloe Ross <[email protected]>",
3637
"Daniel Akhterov <[email protected]>",
3738
]
38-
# TODO: enable this for 0.9.0
39-
# rust-version = "1.80.0"
39+
rust-version = "1.86.0"
4040

4141
[package]
4242
name = "sqlx"
@@ -48,6 +48,7 @@ license.workspace = true
4848
edition.workspace = true
4949
authors.workspace = true
5050
repository.workspace = true
51+
rust-version.workspace = true
5152

5253
[package.metadata.docs.rs]
5354
features = ["all-databases", "_unstable-all-types", "sqlite-preupdate-hook"]
@@ -91,14 +92,6 @@ tls-rustls-ring-native-roots = ["sqlx-core/_tls-rustls-ring-native-roots", "sqlx
9192
# No-op feature used by the workflows to compile without TLS enabled. Not meant for general use.
9293
tls-none = []
9394

94-
# Legacy Runtime + TLS features
95-
96-
runtime-async-std-native-tls = ["runtime-async-std", "tls-native-tls"]
97-
runtime-async-std-rustls = ["runtime-async-std", "tls-rustls-ring"]
98-
99-
runtime-tokio-native-tls = ["runtime-tokio", "tls-native-tls"]
100-
runtime-tokio-rustls = ["runtime-tokio", "tls-rustls-ring"]
101-
10295
# for conditional compilation
10396
_rt-async-std = []
10497
_rt-tokio = []
@@ -129,17 +122,17 @@ bstr = ["sqlx-core/bstr"]
129122

130123
[workspace.dependencies]
131124
# Core Crates
132-
sqlx-core = { version = "=0.8.6", path = "sqlx-core" }
133-
sqlx-macros-core = { version = "=0.8.6", path = "sqlx-macros-core" }
134-
sqlx-macros = { version = "=0.8.6", path = "sqlx-macros" }
125+
sqlx-core = { version = "=0.9.0-alpha.1", path = "sqlx-core" }
126+
sqlx-macros-core = { version = "=0.9.0-alpha.1", path = "sqlx-macros-core" }
127+
sqlx-macros = { version = "=0.9.0-alpha.1", path = "sqlx-macros" }
135128

136129
# Driver crates
137-
sqlx-mysql = { version = "=0.8.6", path = "sqlx-mysql" }
138-
sqlx-postgres = { version = "=0.8.6", path = "sqlx-postgres" }
139-
sqlx-sqlite = { version = "=0.8.6", path = "sqlx-sqlite" }
130+
sqlx-mysql = { version = "=0.9.0-alpha.1", path = "sqlx-mysql" }
131+
sqlx-postgres = { version = "=0.9.0-alpha.1", path = "sqlx-postgres" }
132+
sqlx-sqlite = { version = "=0.9.0-alpha.1", path = "sqlx-sqlite" }
140133

141134
# Facade crate (for reference from sqlx-cli)
142-
sqlx = { version = "=0.8.6", path = ".", default-features = false }
135+
sqlx = { version = "=0.9.0-alpha.1", path = ".", default-features = false }
143136

144137
# Common type integrations shared by multiple driver crates.
145138
# These are optional unless enabled in a workspace crate.

FAQ.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ As a rule, however, we only officially support the range of versions for each da
1818
For each database and where applicable, we test against the latest and oldest versions that we intend to support. You can see the current versions being tested against by looking at our CI config: https://github.com/launchbadge/sqlx/blob/main/.github/workflows/sqlx.yml#L168
1919

2020
-------------------------------------------------------------------
21+
<a name="MSRV"></a>
2122
### What versions of Rust does SQLx support? What is SQLx's MSRV\*?
2223

2324
SQLx's MSRV is the second-to-latest stable release as of the beginning of the current release cycle (`0.x.0`).

README.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,16 +165,8 @@ be removed in the future.
165165

166166
- `runtime-async-std`: Use the `async-std` runtime without enabling a TLS backend.
167167

168-
- `runtime-async-std-native-tls`: Use the `async-std` runtime and `native-tls` TLS backend (SOFT-DEPRECATED).
169-
170-
- `runtime-async-std-rustls`: Use the `async-std` runtime and `rustls` TLS backend (SOFT-DEPRECATED).
171-
172168
- `runtime-tokio`: Use the `tokio` runtime without enabling a TLS backend.
173169

174-
- `runtime-tokio-native-tls`: Use the `tokio` runtime and `native-tls` TLS backend (SOFT-DEPRECATED).
175-
176-
- `runtime-tokio-rustls`: Use the `tokio` runtime and `rustls` TLS backend (SOFT-DEPRECATED).
177-
178170
- Actix-web is fully compatible with Tokio and so a separate runtime feature is no longer needed.
179171

180172
- `tls-native-tls`: Use the `native-tls` TLS backend (OpenSSL on *nix, SChannel on Windows, Secure Transport on macOS).

benches/sqlite/describe.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use criterion::Criterion;
33
use criterion::{criterion_group, criterion_main};
44

55
use sqlx::sqlite::{Sqlite, SqliteConnection};
6-
use sqlx::{Connection, Executor};
6+
use sqlx::Executor;
77
use sqlx_test::new;
88

99
// Here we have an async function to benchmark

examples/postgres/listen/src/main.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ from (
9898
) notifies(chan, payload)
9999
"#,
100100
)
101-
.bind(&COUNTER.fetch_add(1, Ordering::SeqCst))
102-
.bind(&COUNTER.fetch_add(1, Ordering::SeqCst))
103-
.bind(&COUNTER.fetch_add(1, Ordering::SeqCst))
101+
.bind(COUNTER.fetch_add(1, Ordering::SeqCst))
102+
.bind(COUNTER.fetch_add(1, Ordering::SeqCst))
103+
.bind(COUNTER.fetch_add(1, Ordering::SeqCst))
104104
.execute(pool)
105105
.await;
106106

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Note: should NOT increase during a minor/patch release cycle
22
[toolchain]
3-
channel = "1.78"
3+
channel = "1.86"
44
profile = "minimal"

sqlx-bench/Cargo.toml

Lines changed: 0 additions & 47 deletions
This file was deleted.

sqlx-bench/README.md

Lines changed: 0 additions & 39 deletions
This file was deleted.

sqlx-bench/benches/pg_pool.rs

Lines changed: 0 additions & 80 deletions
This file was deleted.

0 commit comments

Comments
 (0)