Create databases if it does not exist for services

DiamondLightSource · Mar 6, 2024 · 134b423 · 134b423
1 parent 72929c7
commit 134b423
Show file tree

Hide file tree

Showing 5 changed files with 100 additions and 16 deletions.
diff --git a/backend/compound_library/src/main.rs b/backend/compound_library/src/main.rs
@@ -19,7 +19,10 @@ use graphql::{root_schema_builder, RootSchema};
 use graphql_endpoints::{GraphQLHandler, GraphQLSubscription, GraphiQLHandler};
 use migrator::Migrator;
 use opa_client::OPAClient;
-use sea_orm::{ConnectOptions, Database, DatabaseConnection, DbErr, TransactionError};
+use sea_orm::{
+    ConnectOptions, ConnectionTrait, Database, DatabaseConnection, DbErr, Statement,
+    TransactionError,
+};
 use sea_orm_migration::MigratorTrait;
 use std::{
     fs::File,
@@ -70,11 +73,25 @@ struct SchemaArgs {
 async fn setup_database(
     mut database_url: Url,
 ) -> Result<DatabaseConnection, TransactionError<DbErr>> {
+    let mut connection_options = ConnectOptions::new(database_url.to_string());
+    let mut connection = Database::connect(connection_options).await?;
+
     if database_url.path().is_empty() {
         database_url.set_path("compound_library");
     }
-    let connection_options = ConnectOptions::new(database_url.to_string());
-    let connection = Database::connect(connection_options).await?;
+    // Creates a new database, ignored if database already exists
+    let _db_creation = connection
+        .execute(Statement::from_string(
+            connection.get_database_backend(),
+            format!(
+                "CREATE DATABASE \"{}\";",
+                database_url.path().trim_start_matches('/')
+            ),
+        ))
+        .await;
+    // connects to database path
+    connection_options = ConnectOptions::new(database_url.to_string());
+    connection = Database::connect(connection_options).await?;
     Migrator::up(&connection, None).await?;
     Ok(connection)
 }

diff --git a/backend/compound_soaking/src/main.rs b/backend/compound_soaking/src/main.rs
@@ -18,7 +18,10 @@ use clap::Parser;
 use graphql::{root_schema_builder, RootSchema};
 use graphql_endpoints::{GraphQLHandler, GraphQLSubscription, GraphiQLHandler};
 use opa_client::OPAClient;
-use sea_orm::{ConnectOptions, Database, DatabaseConnection, DbErr, TransactionError};
+use sea_orm::{
+    ConnectOptions, ConnectionTrait, Database, DatabaseConnection, DbErr, Statement,
+    TransactionError,
+};
 use sea_orm_migration::MigratorTrait;
 use std::{
     fs::File,
@@ -66,11 +69,24 @@ struct SchemaArgs {
 async fn setup_database(
     mut database_url: Url,
 ) -> Result<DatabaseConnection, TransactionError<DbErr>> {
+    let mut connection_options = ConnectOptions::new(database_url.to_string());
+    let mut connection = Database::connect(connection_options).await?;
     if database_url.path().is_empty() {
         database_url.set_path("compound_soaking");
     }
-    let connection_options = ConnectOptions::new(database_url.to_string());
-    let connection = Database::connect(connection_options).await?;
+    // Creates a new database, ignored if database already exists
+    let _db_creation = connection
+        .execute(Statement::from_string(
+            connection.get_database_backend(),
+            format!(
+                "CREATE DATABASE \"{}\";",
+                database_url.path().trim_start_matches('/')
+            ),
+        ))
+        .await;
+    // connects to database path
+    connection_options = ConnectOptions::new(database_url.to_string());
+    connection = Database::connect(connection_options).await?;
     migrator::Migrator::up(&connection, None).await?;
     Ok(connection)
 }

diff --git a/backend/crystal_library/src/main.rs b/backend/crystal_library/src/main.rs
@@ -18,7 +18,10 @@ use clap::Parser;
 use graphql::{root_schema_builder, RootSchema};
 use graphql_endpoints::{GraphQLHandler, GraphQLSubscription, GraphiQLHandler};
 use opa_client::OPAClient;
-use sea_orm::{ConnectOptions, Database, DatabaseConnection, DbErr, TransactionError};
+use sea_orm::{
+    ConnectOptions, ConnectionTrait, Database, DatabaseConnection, DbErr, Statement,
+    TransactionError,
+};
 use sea_orm_migration::MigratorTrait;
 use std::{
     fs::File,
@@ -69,11 +72,24 @@ struct SchemaArgs {
 async fn setup_database(
     mut database_url: Url,
 ) -> Result<DatabaseConnection, TransactionError<DbErr>> {
+    let mut connection_options = ConnectOptions::new(database_url.to_string());
+    let mut connection = Database::connect(connection_options).await?;
     if database_url.path().is_empty() {
         database_url.set_path("crystal_library");
     }
-    let connection_options = ConnectOptions::new(database_url.to_string());
-    let connection = Database::connect(connection_options).await?;
+    // Creates a new database, ignored if database already exists
+    let _db_creation = connection
+        .execute(Statement::from_string(
+            connection.get_database_backend(),
+            format!(
+                "CREATE DATABASE \"{}\";",
+                database_url.path().trim_start_matches('/')
+            ),
+        ))
+        .await;
+    // connects to database path
+    connection_options = ConnectOptions::new(database_url.to_string());
+    connection = Database::connect(connection_options).await?;
     migrator::Migrator::up(&connection, None).await?;
     Ok(connection)
 }

diff --git a/backend/pin_packing/src/main.rs b/backend/pin_packing/src/main.rs
@@ -12,7 +12,10 @@ use graphql::{root_schema_builder, RootSchema};
 use graphql_endpoints::{GraphQLHandler, GraphQLSubscription, GraphiQLHandler};
 use migrations::Migrator;
 use opa_client::OPAClient;
-use sea_orm::{ConnectOptions, Database, DatabaseConnection, DbErr, TransactionError};
+use sea_orm::{
+    ConnectOptions, ConnectionTrait, Database, DatabaseConnection, DbErr, Statement,
+    TransactionError,
+};
 use sea_orm_migration::MigratorTrait;
 use std::{
     fs::File,
@@ -41,11 +44,24 @@ fn setup_router(schema: RootSchema) -> Router {
 async fn setup_database(
     mut database_url: Url,
 ) -> Result<DatabaseConnection, TransactionError<DbErr>> {
+    let mut connection_options = ConnectOptions::new(database_url.to_string());
+    let mut connection = Database::connect(connection_options).await?;
     if database_url.path().is_empty() {
         database_url.set_path("pin_packing");
     }
-    let connection_options = ConnectOptions::new(database_url.to_string());
-    let connection = Database::connect(connection_options).await?;
+    // Creates a new database, ignored if database already exists
+    let _db_creation = connection
+        .execute(Statement::from_string(
+            connection.get_database_backend(),
+            format!(
+                "CREATE DATABASE \"{}\";",
+                database_url.path().trim_start_matches('/')
+            ),
+        ))
+        .await;
+    // connects to database path
+    connection_options = ConnectOptions::new(database_url.to_string());
+    connection = Database::connect(connection_options).await?;
     Migrator::up(&connection, None).await?;
     Ok(connection)
 }

diff --git a/backend/targeting/src/lib.rs b/backend/targeting/src/lib.rs
@@ -11,7 +11,10 @@ pub use graphql::root_schema_builder;
 use graphql::RootSchema;
 use graphql_endpoints::{GraphQLHandler, GraphQLSubscription, GraphiQLHandler};
 use migrations::Migrator;
-use sea_orm::{ConnectOptions, Database, DatabaseConnection, DbErr, TransactionError};
+use sea_orm::{
+    ConnectOptions, ConnectionTrait, Database, DatabaseConnection, DbErr, Statement,
+    TransactionError,
+};
 use sea_orm_migration::MigratorTrait;
 use std::net::{Ipv4Addr, SocketAddr, SocketAddrV4};
 use url::Url;
@@ -33,10 +36,26 @@ pub fn setup_router(schema: RootSchema) -> Router {
 }
 
 pub async fn setup_database(
-    database_url: Url,
+    mut database_url: Url,
 ) -> Result<DatabaseConnection, TransactionError<DbErr>> {
-    let connection_options = ConnectOptions::new(database_url.to_string());
-    let connection = Database::connect(connection_options).await?;
+    let mut connection_options = ConnectOptions::new(database_url.to_string());
+    let mut connection = Database::connect(connection_options).await?;
+    if database_url.path().is_empty() {
+        database_url.set_path("targeting");
+    }
+    // Creates a new database, ignored if database already exists
+    let _db_creation = connection
+        .execute(Statement::from_string(
+            connection.get_database_backend(),
+            format!(
+                "CREATE DATABASE \"{}\";",
+                database_url.path().trim_start_matches('/')
+            ),
+        ))
+        .await;
+    // connects to database path
+    connection_options = ConnectOptions::new(database_url.to_string());
+    connection = Database::connect(connection_options).await?;
     Migrator::up(&connection, None).await?;
     Ok(connection)
 }