feat(rust): start a new sql file for postgres

build-trust · Jan 10, 2025 · ad01b0d · ad01b0d
1 parent bbcd779
commit ad01b0d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 17 deletions.
diff --git a/...age/database/migrations/node_migrations/sql/postgres/20240703100000_add_subscriptions.sql b/...age/database/migrations/node_migrations/sql/postgres/20240703100000_add_subscriptions.sql
diff --git a/...atabase/migrations/node_migrations/sql/postgres/20241112100000_add_privileged_portals.sql b/...atabase/migrations/node_migrations/sql/postgres/20241112100000_add_privileged_portals.sql
diff --git a/implementations/rust/ockam/ockam_node/src/storage/database/sqlx_database.rs b/implementations/rust/ockam/ockam_node/src/storage/database/sqlx_database.rs
@@ -433,14 +433,27 @@ where
     let db = SqlxDatabase::create_sqlite(db_file.path()).await?;
     rethrow("SQLite on disk", f(db)).await?;
 
-    // only run the postgres tests if the OCKAM_POSTGRES_* environment variables are set
+    // only run the postgres tests if the OCKAM_DATABASE_CONNECTION_URL environment variables is set
     if let Ok(db) = SqlxDatabase::create_new_postgres().await {
         rethrow("Postgres local", f(db.clone())).await?;
         db.drop_all_postgres_tables().await?;
     };
     Ok(())
 }
 
+/// This function can be used to avoid running a test if the postgres database is used.
+pub async fn without_postgres<F, Fut, R>(f: F) -> std::result::Result<(), R>
+where
+    F: Fn() -> Fut + Send + Sync + 'static,
+    Fut: Future<Output = std::result::Result<(), R>> + Send + 'static,
+{
+    // only run the postgres tests if the OCKAM_DATABASE_CONNECTION_URL environment variables is not set
+    if let Err(_) = SqlxDatabase::create_new_postgres().await {
+        f().await?
+    };
+    Ok(())
+}
+
 /// This function can be used to run some test code with the 3 different databases implementations
 /// of the application database
 pub async fn with_application_dbs<F, Fut>(f: F) -> Result<()>