feat: Put MySQL and Sqlite test connexions behind flag

mozilla-services · Nov 20, 2024 · 8eb5041 · 8eb5041
1 parent f2f12fa
commit 8eb5041
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/syncserver-db-common/Cargo.toml b/syncserver-db-common/Cargo.toml
@@ -18,3 +18,5 @@ syncserver-common = { path = "../syncserver-common" }
 
 [features]
 sql = []
+mysql = ["sql"]
+sqlite = ["sql"]
diff --git a/syncserver-db-common/src/test.rs b/syncserver-db-common/src/test.rs
@@ -1,19 +1,24 @@
 use diesel::{
-    mysql::MysqlConnection,
     r2d2::{CustomizeConnection, Error as PoolError},
-    sqlite::SqliteConnection,
     Connection,
 };
 
+#[cfg(feature = "mysql")]
+use diesel::mysql::MysqlConnection;
+#[cfg(feature = "sqlite")]
+use diesel::sqlite::SqliteConnection;
+
 #[derive(Debug)]
 pub struct TestTransactionCustomizer;
 
+#[cfg(feature = "mysql")]
 impl CustomizeConnection<MysqlConnection, PoolError> for TestTransactionCustomizer {
     fn on_acquire(&self, conn: &mut MysqlConnection) -> Result<(), PoolError> {
         conn.begin_test_transaction().map_err(PoolError::QueryError)
     }
 }
 
+#[cfg(feature = "sqlite")]
 impl CustomizeConnection<SqliteConnection, PoolError> for TestTransactionCustomizer {
     fn on_acquire(&self, conn: &mut SqliteConnection) -> Result<(), PoolError> {
         conn.begin_test_transaction().map_err(PoolError::QueryError)

diff --git a/syncstorage-mysql/Cargo.toml b/syncstorage-mysql/Cargo.toml
@@ -18,7 +18,7 @@ diesel = { workspace = true, features = ["mysql", "r2d2"] }
 diesel_logger = { workspace = true }
 diesel_migrations = { workspace = true, features = ["mysql"] }
 syncserver-common = { path = "../syncserver-common" }
-syncserver-db-common = { path = "../syncserver-db-common", features = ["sql"] }
+syncserver-db-common = { path = "../syncserver-db-common", features = ["mysql"] }
 syncstorage-db-common = { path = "../syncstorage-db-common" }
 syncstorage-settings = { path = "../syncstorage-settings" }
 syncstorage-sql-db-common = { path = "../syncstorage-sql-db-common" }

diff --git a/syncstorage-sqlite/Cargo.toml b/syncstorage-sqlite/Cargo.toml
@@ -11,17 +11,17 @@ base64.workspace=true
 futures.workspace=true
 http.workspace=true
 slog-scope.workspace=true
+thiserror.workspace = true
+diesel_logger.workspace = true
 
 async-trait = "0.1.40"
-diesel = { version = "1.4", features = ["sqlite", "r2d2"] }
-diesel_logger = "0.1.1"
-diesel_migrations = { version = "1.4.0", features = ["sqlite"] }
+diesel = { workspace = true, features = ["sqlite", "r2d2"] }
+diesel_migrations = { workspace = true, features = ["sqlite"] }
 syncserver-common = { path = "../syncserver-common" }
-syncserver-db-common = { path = "../syncserver-db-common", features = ["sql"] }
+syncserver-db-common = { path = "../syncserver-db-common", features = ["sqlite"] }
 syncstorage-db-common = { path = "../syncstorage-db-common" }
 syncstorage-settings = { path = "../syncstorage-settings" }
 syncstorage-sql-db-common = { path = "../syncstorage-sql-db-common" }
-thiserror = "1.0.26"
 url = "2.1"
 
 [dev-dependencies]

diff --git a/tokenserver-db/Cargo.toml b/tokenserver-db/Cargo.toml
@@ -21,7 +21,7 @@ diesel = { workspace = true, features = ["mysql", "r2d2"] }
 diesel_logger = { workspace = true }
 diesel_migrations = { workspace = true, features = ["mysql"] }
 syncserver-common = { path = "../syncserver-common" }
-syncserver-db-common = { path = "../syncserver-db-common", features = ["sql"] }
+syncserver-db-common = { path = "../syncserver-db-common", features = ["mysql", "sqlite"] }
 tokenserver-common = { path = "../tokenserver-common" }
 tokenserver-settings = { path = "../tokenserver-settings" }
 tokenserver-db-common = { path = "../tokenserver-db-common" }