fix feature flags

maxcountryman · Oct 28, 2023 · 558f0c3 · 558f0c3
1 parent d82d2b2
commit 558f0c3
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -124,16 +124,16 @@ jobs:
             features: moka-store,sqlite-store
             docker: false
 
-          - store: mysql_store
-            features: diesel-store,diesel/mysql
-            docker: true
-
           - store: postgres_store
-            features: diesel-store,diesel/postgres
+            features: diesel-postgres-store
+
+            docker: true
+          - store: mysql_store
+            features: diesel-mysql-store
             docker: true
 
           - store: diesel_store
-            features: diesel-store
+            features: diesel-sqlite-store
             docker: false
 
     steps:

diff --git a/Cargo.toml b/Cargo.toml
@@ -19,14 +19,24 @@ tokio-rt = ["tokio/rt"]
 tokio-time = ["tokio/time"]
 continuously-delete-expired = ["tokio-rt", "tokio-time"]
 memory-store = []
+
+moka-store = ["moka"]
+
 redis-store = ["fred", "rmp-serde"]
+
 mongodb-store = ["mongodb", "bson", "rmp-serde"]
+
+# SQLx feature flags.
 sqlx-store = ["sqlx", "rmp-serde"]
 sqlite-store = ["sqlx/sqlite", "sqlx-store"]
 postgres-store = ["sqlx/postgres", "sqlx-store"]
 mysql-store = ["sqlx/mysql", "sqlx-store"]
-moka-store = ["moka"]
+
+# Diesel feature flags.
 diesel-store = ["dep:diesel", "tokio/rt", "rmp-serde"]
+diesel-sqlite-store = ["diesel-store", "diesel/sqlite"]
+diesel-postgres-store = ["diesel-store", "diesel/postgres"]
+diesel-mysql-store = ["diesel-store", "diesel/mysql"]
 
 [dependencies]
 async-trait = "0.1.73"

diff --git a/tests/integration-tests.rs b/tests/integration-tests.rs
@@ -118,7 +118,7 @@ mod mysql_store_tests {
     route_tests!(app);
 }
 
-#[cfg(all(test, feature = "axum-core", feature = "diesel-store"))]
+#[cfg(all(test, feature = "axum-core", feature = "diesel-sqlite-store"))]
 mod diesel_sqlite_store_tests {
     use axum::Router;
     use diesel::{
@@ -144,12 +144,7 @@ mod diesel_sqlite_store_tests {
     route_tests!(app);
 }
 
-#[cfg(all(
-    test,
-    feature = "axum-core",
-    feature = "diesel-store",
-    feature = "__diesel_postgres"
-))]
+#[cfg(all(test, feature = "axum-core", feature = "diesel-postgres-store"))]
 mod diesel_pg_store_tests {
     use axum::Router;
     use diesel::{
@@ -176,12 +171,7 @@ mod diesel_pg_store_tests {
     route_tests!(app);
 }
 
-#[cfg(all(
-    test,
-    feature = "axum-core",
-    feature = "diesel-store",
-    feature = "__diesel_mysql"
-))]
+#[cfg(all(test, feature = "axum-core", feature = "diesel-mysql-store"))]
 mod diesel_mysql_store_tests {
     use axum::Router;
     use diesel::{