feat: conditionally init postgres/mariadb connection

src/data.rs

@@ -19,8 +19,6 @@ use std::thread;
 
 use actix::prelude::*;
 use argon2_creds::{Config, ConfigBuilder, PasswordPolicy};
-use db_core::prelude::*;
-use db_sqlx_postgres::{ConnectionOptions, Fresh};
 use lettre::transport::smtp::authentication::Mechanism;
 use lettre::{
     transport::smtp::authentication::Credentials, AsyncSmtpTransport, Tokio1Executor,
@@ -40,10 +38,8 @@ use libmcaptcha::{
     pow::Work,
     system::{System, SystemBuilder},
 };
-use sqlx::postgres::PgPoolOptions;
-
-use db_core::MCDatabase;
 
+use crate::db::{self, BoxDB};
 use crate::errors::ServiceResult;
 use crate::settings::Settings;
 use crate::stats::{Dummy, Real, Stats};
@@ -149,7 +145,7 @@ impl SystemGroup {
 /// App data
 pub struct Data {
     /// database ops defined by db crates
-    pub db: Box<dyn MCDatabase>,
+    pub db: BoxDB,
     /// credential management configuration
     pub creds: Config,
     /// mCaptcha system: Redis cache, etc.
@@ -185,15 +181,10 @@ impl Data {
             log::info!("Initialized credential manager");
         });
 
-        let pool = s.database.pool;
-        let pool_options = PgPoolOptions::new().max_connections(pool);
-        let connection_options = ConnectionOptions::Fresh(Fresh {
-            pool_options,
-            url: s.database.url.clone(),
-            disable_logging: !s.debug,
-        });
-        let db = connection_options.connect().await.unwrap();
-        db.migrate().await.unwrap();
+        let db = match s.database.database_type {
+            crate::settings::DBType::Maria => db::maria::get_data(Some(s.clone())).await,
+            crate::settings::DBType::Postgres => db::pg::get_data(Some(s.clone())).await,
+        };
 
         let stats: Box<dyn Stats> = if s.captcha.enable_stats {
             Box::new(Real::default())
@@ -203,7 +194,7 @@ impl Data {
 
         let data = Data {
             creds,
-            db: Box::new(db),
+            db,
             captcha: SystemGroup::new(s).await,
             mailer: Self::get_mailer(s),
             settings: s.clone(),

src/db.rs

@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2022  Aravinth Manivannan <realaravinth@batsense.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+use crate::settings::Settings;
+use db_core::prelude::*;
+
+pub type BoxDB = Box<dyn MCDatabase>;
+
+pub mod pg {
+    use super::*;
+    use db_sqlx_postgres::{ConnectionOptions, Fresh};
+    use sqlx::postgres::PgPoolOptions;
+
+    pub async fn get_data(settings: Option<Settings>) -> BoxDB {
+        let settings = settings.unwrap_or_else(|| Settings::new().unwrap());
+        let pool = settings.database.pool;
+        let pool_options = PgPoolOptions::new().max_connections(pool);
+        let connection_options = ConnectionOptions::Fresh(Fresh {
+            pool_options,
+            url: settings.database.url.clone(),
+            disable_logging: !settings.debug,
+        });
+        let db = connection_options.connect().await.unwrap();
+        db.migrate().await.unwrap();
+        Box::new(db)
+    }
+}
+
+pub mod maria {
+    use super::*;
+    use db_sqlx_maria::{ConnectionOptions, Fresh};
+    use sqlx::mysql::MySqlPoolOptions;
+
+    pub async fn get_data(settings: Option<Settings>) -> BoxDB {
+        let settings = settings.unwrap_or_else(|| Settings::new().unwrap());
+        let pool = settings.database.pool;
+        let pool_options = MySqlPoolOptions::new().max_connections(pool);
+        let connection_options = ConnectionOptions::Fresh(Fresh {
+            pool_options,
+            url: settings.database.url.clone(),
+            disable_logging: !settings.debug,
+        });
+        let db = connection_options.connect().await.unwrap();
+        db.migrate().await.unwrap();
+        Box::new(db)
+    }
+}

src/main.rs

@@ -28,6 +28,7 @@ use log::info;
 mod api;
 mod data;
 mod date;
+mod db;
 mod demo;
 mod docs;
 mod email;