Skip to content

Commit

Permalink
Merge pull request #24 from wasdacraic/sqlx-update
Browse files Browse the repository at this point in the history
Upgrade `sqlx` to 0.7
  • Loading branch information
connec committed Sep 15, 2023
2 parents ca316d8 + f13a5d5 commit 6a52953
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
9 changes: 4 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"]
Expand All @@ -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"
Expand All @@ -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"
4 changes: 0 additions & 4 deletions src/tx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@ impl<DB: sqlx::Database> Lazy<DB> {

#[cfg(any(
feature = "any",
feature = "mssql",
feature = "mysql",
feature = "postgres",
feature = "sqlite"
Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit 6a52953

Please sign in to comment.