From f13a5d51ffe96b59f41b13934ad41d6638145029 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ch=2E=20K=C3=B6nig?= Date: Sat, 15 Jul 2023 12:18:51 +0200 Subject: [PATCH] chore!: upgrade `sqlx` to 0.7 This required adding the `rt-multi-thread` feature to `tokio` in dev, since `sqlx` no longer enables it. BREAKING CHANGE: The library does not support MSSQL anymore, as SQLx dropped support --- .github/workflows/pr.yaml | 2 +- Cargo.toml | 9 ++++----- src/tx.rs | 4 ---- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 8234448..5a426bc 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - db: ['', all-databases, mssql, mysql, postgres, sqlite] + db: ['', all-databases, mysql, postgres, sqlite] db_any: ['', any] runtime: [runtime-tokio-native-tls, runtime-tokio-rustls] exclude: diff --git a/Cargo.toml b/Cargo.toml index 3950a9a..e5277a0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "axum-sqlx-tx" description = "Request-scoped SQLx transactions for axum" -version = "0.5.0" +version = "0.6.0" license = "MIT" repository = "https://github.com/wasdacraic/axum-sqlx-tx/" edition = "2021" @@ -13,9 +13,8 @@ include = [ ] [features] -all-databases = ["any", "mssql", "mysql", "postgres", "sqlite"] +all-databases = ["any", "mysql", "postgres", "sqlite"] any = ["sqlx/any"] -mssql = ["sqlx/mssql"] mysql = ["sqlx/mysql"] postgres = ["sqlx/postgres"] sqlite = ["sqlx/sqlite"] @@ -33,7 +32,7 @@ futures-core = "0.3" http = "0.2" http-body = "0.4" parking_lot = "0.12" -sqlx = { version = "0.6", default-features = false } +sqlx = { version = "0.7", default-features = false } thiserror = "1" tower-layer = "0.3" tower-service = "0.3" @@ -43,5 +42,5 @@ axum-sqlx-tx = { path = ".", features = ["runtime-tokio-rustls", "sqlite"] } axum = "0.6.4" hyper = "0.14.17" tempfile = "3.3.0" -tokio = { version = "1.17.0", features = ["macros"] } +tokio = { version = "1.17.0", features = ["macros", "rt-multi-thread"] } tower = "0.4.12" diff --git a/src/tx.rs b/src/tx.rs index 9175ac5..2a0d29d 100644 --- a/src/tx.rs +++ b/src/tx.rs @@ -183,7 +183,6 @@ impl Lazy { #[cfg(any( feature = "any", - feature = "mssql", feature = "mysql", feature = "postgres", feature = "sqlite" @@ -266,9 +265,6 @@ mod sqlx_impls { #[cfg(feature = "any")] impl_executor!(sqlx::Any); - #[cfg(feature = "mssql")] - impl_executor!(sqlx::Mssql); - #[cfg(feature = "mysql")] impl_executor!(sqlx::MySql);