Skip to content

Commit cbcf68f

Browse files
authored
Merge pull request #246 from weiznich/fix_main/244
Fix building with different feature combinations
2 parents f8263a1 + baf587a commit cbcf68f

File tree

6 files changed

+31
-8
lines changed

6 files changed

+31
-8
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,3 +246,12 @@ jobs:
246246
# cannot test sqlite yet as that crate
247247
# as broken min-version dependencies as well
248248
run: cargo +1.84.0 minimal-versions check -p diesel-async --features "postgres bb8 deadpool mobc"
249+
all_features_build:
250+
name: Check all feature combination build
251+
runs-on: ubuntu-latest
252+
steps:
253+
- uses: actions/checkout@v4
254+
- uses: dtolnay/rust-toolchain@stable
255+
- uses: taiki-e/install-action@cargo-hack
256+
- name: Check feature combinations
257+
run: cargo hack check --feature-powerset --no-dev-deps --depth 2

CHANGELOG.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,17 @@ for Rust libraries in [RFC #1105](https://github.com/rust-lang/rfcs/blob/master/
66

77
## [Unreleased]
88

9+
## [0.6.1] - 2025-07-03
10+
11+
* Fix features for some dependencies
12+
13+
## [0.6.0] - 2025-07-02
14+
15+
* Allow to control the statement cache size
16+
* Minimize dependencies features
17+
* Bump minimal supported mysql_async version to 0.36.0
18+
* Fixing a bug in how we tracked open transaction that could lead to dangling transactions is specific cases
19+
920
## [0.5.2] - 2024-11-26
1021

1122
* Fixed an issue around transaction cancellation that could lead to connection pools containing connections with dangling transactions
@@ -87,4 +98,7 @@ in the pool should be checked if they are still valid
8798
[0.4.1]: https://github.com/weiznich/diesel_async/compare/v0.4.0...v0.4.1
8899
[0.5.0]: https://github.com/weiznich/diesel_async/compare/v0.4.0...v0.5.0
89100
[0.5.1]: https://github.com/weiznich/diesel_async/compare/v0.5.0...v0.5.1
90-
[Unreleased]: https://github.com/weiznich/diesel_async/compare/v0.5.1...main
101+
[0.5.2]: https://github.com/weiznich/diesel_async/compare/v0.5.1...v0.5.2
102+
[0.6.0]: https://github.com/weiznich/diesel_async/compare/v0.5.2...v0.6.0
103+
[0.6.1]: https://github.com/weiznich/diesel_async/compare/v0.6.0...v0.6.1
104+
[Unreleased]: https://github.com/weiznich/diesel_async/compare/v0.6.1...main

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "diesel-async"
3-
version = "0.5.2"
3+
version = "0.6.1"
44
authors = ["Georg Semmler <[email protected]>"]
55
edition = "2021"
66
autotests = false
@@ -78,11 +78,11 @@ mysql = [
7878
postgres = ["diesel/postgres_backend", "tokio-postgres", "tokio", "tokio/rt"]
7979
sqlite = ["diesel/sqlite", "sync-connection-wrapper"]
8080
sync-connection-wrapper = ["tokio/rt"]
81-
async-connection-wrapper = ["tokio/net"]
81+
async-connection-wrapper = ["tokio/net", "tokio/rt"]
8282
pool = []
8383
r2d2 = ["pool", "diesel/r2d2"]
84-
bb8 = ["pool", "dep:bb8", "dep:async-trait"]
85-
mobc = ["pool", "dep:mobc"]
84+
bb8 = ["pool", "dep:bb8"]
85+
mobc = ["pool", "dep:mobc", "dep:async-trait", "tokio/sync"]
8686
deadpool = ["pool", "dep:deadpool"]
8787

8888
[[test]]

examples/postgres/pooled-with-rustls/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ edition = "2021"
66
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
77

88
[dependencies]
9-
diesel-async = { version = "0.5.0", path = "../../../", features = ["bb8", "postgres"] }
9+
diesel-async = { version = "0.6.0", path = "../../../", features = ["bb8", "postgres"] }
1010
futures-util = "0.3.21"
1111
rustls = "0.23.8"
1212
rustls-platform-verifier = "0.5.0"

examples/postgres/run-pending-migrations-with-rustls/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ edition = "2021"
66
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
77

88
[dependencies]
9-
diesel-async = { version = "0.5.0", path = "../../../", features = ["bb8", "postgres", "async-connection-wrapper"] }
9+
diesel-async = { version = "0.6.0", path = "../../../", features = ["bb8", "postgres", "async-connection-wrapper"] }
1010
futures-util = "0.3.21"
1111
rustls = "0.23.8"
1212
rustls-platform-verifier = "0.5.0"

examples/sync-wrapper/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ edition = "2021"
66
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
77

88
[dependencies]
9-
diesel-async = { version = "0.5.0", path = "../../", features = ["sync-connection-wrapper", "async-connection-wrapper"] }
9+
diesel-async = { version = "0.6.0", path = "../../", features = ["sync-connection-wrapper", "async-connection-wrapper"] }
1010
futures-util = "0.3.21"
1111
tokio = { version = "1.2.0", default-features = false, features = ["macros", "rt-multi-thread"] }
1212

0 commit comments

Comments
 (0)