Skip to content

groundwork for 0.9.0-alpha.1 #3821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 11 additions & 18 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ members = [
]

[workspace.package]
version = "0.8.4"
version = "0.9.0-alpha.1"
license = "MIT OR Apache-2.0"
# TODO: upgrade to edition 2024 (after merging all pending PRs)
edition = "2021"
repository = "https://github.com/launchbadge/sqlx"
keywords = ["database", "async", "postgres", "mysql", "sqlite"]
Expand All @@ -35,8 +36,7 @@ authors = [
"Chloe Ross <[email protected]>",
"Daniel Akhterov <[email protected]>",
]
# TODO: enable this for 0.9.0
# rust-version = "1.80.0"
rust-version = "1.85.0"

[package]
name = "sqlx"
Expand All @@ -48,6 +48,7 @@ license.workspace = true
edition.workspace = true
authors.workspace = true
repository.workspace = true
rust-version.workspace = true

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

# Legacy Runtime + TLS features

runtime-async-std-native-tls = ["runtime-async-std", "tls-native-tls"]
runtime-async-std-rustls = ["runtime-async-std", "tls-rustls-ring"]

runtime-tokio-native-tls = ["runtime-tokio", "tls-native-tls"]
runtime-tokio-rustls = ["runtime-tokio", "tls-rustls-ring"]

# for conditional compilation
_rt-async-std = []
_rt-tokio = []
Expand Down Expand Up @@ -129,17 +122,17 @@ bstr = ["sqlx-core/bstr"]

[workspace.dependencies]
# Core Crates
sqlx-core = { version = "=0.8.4", path = "sqlx-core" }
sqlx-macros-core = { version = "=0.8.4", path = "sqlx-macros-core" }
sqlx-macros = { version = "=0.8.4", path = "sqlx-macros" }
sqlx-core = { version = "=0.9.0-alpha.1", path = "sqlx-core" }
sqlx-macros-core = { version = "=0.9.0-alpha.1", path = "sqlx-macros-core" }
sqlx-macros = { version = "=0.9.0-alpha.1", path = "sqlx-macros" }

# Driver crates
sqlx-mysql = { version = "=0.8.4", path = "sqlx-mysql" }
sqlx-postgres = { version = "=0.8.4", path = "sqlx-postgres" }
sqlx-sqlite = { version = "=0.8.4", path = "sqlx-sqlite" }
sqlx-mysql = { version = "=0.9.0-alpha.1", path = "sqlx-mysql" }
sqlx-postgres = { version = "=0.9.0-alpha.1", path = "sqlx-postgres" }
sqlx-sqlite = { version = "=0.9.0-alpha.1", path = "sqlx-sqlite" }

# Facade crate (for reference from sqlx-cli)
sqlx = { version = "=0.8.4", path = ".", default-features = false }
sqlx = { version = "=0.9.0-alpha.1", path = ".", default-features = false }

# Common type integrations shared by multiple driver crates.
# These are optional unless enabled in a workspace crate.
Expand Down
8 changes: 0 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -165,16 +165,8 @@ be removed in the future.

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

- `runtime-async-std-native-tls`: Use the `async-std` runtime and `native-tls` TLS backend (SOFT-DEPRECATED).

- `runtime-async-std-rustls`: Use the `async-std` runtime and `rustls` TLS backend (SOFT-DEPRECATED).

- `runtime-tokio`: Use the `tokio` runtime without enabling a TLS backend.

- `runtime-tokio-native-tls`: Use the `tokio` runtime and `native-tls` TLS backend (SOFT-DEPRECATED).

- `runtime-tokio-rustls`: Use the `tokio` runtime and `rustls` TLS backend (SOFT-DEPRECATED).

- Actix-web is fully compatible with Tokio and so a separate runtime feature is no longer needed.

- `tls-native-tls`: Use the `native-tls` TLS backend (OpenSSL on *nix, SChannel on Windows, Secure Transport on macOS).
Expand Down
2 changes: 1 addition & 1 deletion benches/sqlite/describe.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use criterion::Criterion;
use criterion::{criterion_group, criterion_main};

use sqlx::sqlite::{Sqlite, SqliteConnection};
use sqlx::{Connection, Executor};
use sqlx::Executor;
use sqlx_test::new;

// Here we have an async function to benchmark
Expand Down
6 changes: 3 additions & 3 deletions examples/postgres/listen/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,9 @@ from (
) notifies(chan, payload)
"#,
)
.bind(&COUNTER.fetch_add(1, Ordering::SeqCst))
.bind(&COUNTER.fetch_add(1, Ordering::SeqCst))
.bind(&COUNTER.fetch_add(1, Ordering::SeqCst))
.bind(COUNTER.fetch_add(1, Ordering::SeqCst))
.bind(COUNTER.fetch_add(1, Ordering::SeqCst))
.bind(COUNTER.fetch_add(1, Ordering::SeqCst))
.execute(pool)
.await;

Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Note: should NOT increase during a minor/patch release cycle
[toolchain]
channel = "1.78"
channel = "1.85"
profile = "minimal"
47 changes: 0 additions & 47 deletions sqlx-bench/Cargo.toml

This file was deleted.

39 changes: 0 additions & 39 deletions sqlx-bench/README.md

This file was deleted.

80 changes: 0 additions & 80 deletions sqlx-bench/benches/pg_pool.rs

This file was deleted.

Loading
Loading