mysql support

Cargo.toml

@@ -20,8 +20,9 @@ auth = ["jsonwebtoken", "quick-error", "rand", "rust-argon2"]
 actix_validation = []
 rs256_jwks = ["alcoholic_jwt", "awc"]
 default = ["pgsql", "auth", "tracing"]
-pgsql = ["diesel", "diesel-derive-newtype", "r2d2"]
-multidb = ["pgsql", "weighted-rs"]
+pgsql = ["diesel/postgres", "diesel-derive-newtype", "r2d2"]
+multidb = ["weighted-rs"]
+mysql = ["diesel/mysql", "diesel-derive-newtype", "r2d2"]
 swagger = ["paperclip"]
 rabbit = ["amiquip", "crossbeam-channel"]
 prometheus = []
@@ -42,7 +43,7 @@ bytes = "1"
 chrono = { version = "0.4", features = ["serde"] }
 crossbeam-channel = { version = "0.5", optional = true }
 derive_more = "0.99"
-diesel = { version = "2.1", features = ["postgres", "chrono", "r2d2"], optional = true }
+diesel = { version = "2.1", features = ["chrono", "r2d2"], optional = true }
 diesel-derive-newtype = { version = "2.1", optional = true }
 dotenv = "0.15"
 futures = "0.3"

src/db_pool/async_queries.rs

@@ -1,7 +1,9 @@
 use std::convert;
 
 use actix_web::web;
-use diesel::{pg::PgConnection, Connection};
+use diesel::Connection;
+
+use super::DbConnection;
 
 #[cfg(not(feature = "multidb"))]
 use super::Pool;
@@ -16,7 +18,7 @@ pub use serwus_derive::Canceled;
 #[cfg(not(feature = "multidb"))]
 pub async fn async_query<F, I, E>(db_pool: Pool, query_func: F) -> Result<I, E>
 where
-    F: FnOnce(&mut PgConnection) -> Result<I, E> + Send + 'static,
+    F: FnOnce(&mut DbConnection) -> Result<I, E> + Send + 'static,
     I: Send + 'static,
     E: From<actix_web::error::BlockingError> + From<r2d2::Error> + std::fmt::Debug + Send + 'static,
 {
@@ -33,7 +35,7 @@ where
 #[cfg(not(feature = "multidb"))]
 pub async fn async_transaction<F, I, E>(db_pool: Pool, query_func: F) -> Result<I, E>
 where
-    F: FnOnce(&mut PgConnection) -> Result<I, E> + Send + 'static,
+    F: FnOnce(&mut DbConnection) -> Result<I, E> + Send + 'static,
     I: Send + 'static,
     E: From<actix_web::error::BlockingError>
         + From<r2d2::Error>
@@ -53,11 +55,11 @@ where
 
 /// Performs query to database in currently open transaction (as blocking task)
 pub async fn async_query_in_trans<F, I, E>(
-    mut connection: PgConnection,
+    mut connection: DbConnection,
     query_func: F,
 ) -> Result<I, E>
 where
-    F: FnOnce(&mut PgConnection) -> Result<I, E> + Send + 'static,
+    F: FnOnce(&mut DbConnection) -> Result<I, E> + Send + 'static,
     I: Send + 'static,
     E: From<actix_web::error::BlockingError> + From<r2d2::Error> + std::fmt::Debug + Send + 'static,
 {
@@ -75,7 +77,7 @@ where
 /// Use async_read_transaction to perform query in real read-only mode.
 pub async fn async_read_query<F, I, E>(db_pool: MultiPool, query_func: F) -> Result<I, E>
 where
-    F: FnOnce(&mut PgConnection) -> Result<I, E> + Send + 'static,
+    F: FnOnce(&mut DbConnection) -> Result<I, E> + Send + 'static,
     I: Send + 'static,
     E: From<actix_web::error::BlockingError> + From<r2d2::Error> + std::fmt::Debug + Send + 'static,
 {
@@ -92,7 +94,7 @@ where
 #[cfg(feature = "multidb")]
 pub async fn async_write_query<F, I, E>(db_pool: MultiPool, query_func: F) -> Result<I, E>
 where
-    F: FnOnce(&mut PgConnection) -> Result<I, E> + Send + 'static,
+    F: FnOnce(&mut DbConnection) -> Result<I, E> + Send + 'static,
     I: Send + 'static,
     E: From<actix_web::error::BlockingError> + From<r2d2::Error> + std::fmt::Debug + Send + 'static,
 {
@@ -109,7 +111,7 @@ where
 #[cfg(feature = "multidb")]
 pub async fn async_read_transaction<F, I, E>(db_pool: MultiPool, query_func: F) -> Result<I, E>
 where
-    F: FnOnce(&mut PgConnection) -> Result<I, E> + Send + 'static,
+    F: FnOnce(&mut DbConnection) -> Result<I, E> + Send + 'static,
     I: Send + 'static,
     E: From<actix_web::error::BlockingError>
         + From<r2d2::Error>
@@ -136,7 +138,7 @@ where
 #[cfg(feature = "multidb")]
 pub async fn async_write_transaction<F, I, E>(db_pool: MultiPool, query_func: F) -> Result<I, E>
 where
-    F: FnOnce(&mut PgConnection) -> Result<I, E> + Send + 'static,
+    F: FnOnce(&mut DbConnection) -> Result<I, E> + Send + 'static,
     I: Send + 'static,
     E: From<actix_web::error::BlockingError>
         + From<r2d2::Error>

src/db_pool/mod.rs

@@ -8,3 +8,23 @@ pub mod multi;
 
 mod async_queries;
 pub use async_queries::*;
+
+#[cfg(feature = "pgsql")]
+use diesel::pg::PgConnection;
+#[cfg(all(feature = "mysql", not(feature = "pgsql")))]
+use diesel::mysql::MysqlConnection;
+
+#[cfg(feature = "pgsql")]
+pub type DbConnection = PgConnection;
+#[cfg(all(feature = "mysql", not(feature = "pgsql")))]
+pub type DbConnection = MysqlConnection;
+
+#[cfg(feature = "pgsql")]
+use diesel::pg::Pg;
+#[cfg(all(feature = "mysql", not(feature = "pgsql")))]
+use diesel::mysql::Mysql;
+
+#[cfg(feature = "pgsql")]
+pub type Db = Pg;
+#[cfg(all(feature = "mysql", not(feature = "pgsql")))]
+pub type Db = Mysql;

src/db_pool/single.rs

@@ -1,11 +1,12 @@
-use diesel::pg::PgConnection;
 use diesel::r2d2::ConnectionManager;
 use std::env;
 use log::{error, info};
 
 use crate::threads::num_threads;
 
-pub type Pool = diesel::r2d2::Pool<ConnectionManager<PgConnection>>;
+use super::DbConnection;
+
+pub type Pool = diesel::r2d2::Pool<ConnectionManager<DbConnection>>;
 
 /// Init pool of N connections to single database, where N is number of threads (but not less than 2).
 ///
@@ -23,7 +24,7 @@ pub fn init_default_pool() -> Result<Pool, r2d2::Error> {
 pub fn init_pool(size: usize) -> Result<Pool, r2d2::Error> {
     info!("Connecting to database");
 
-    let manager = ConnectionManager::<PgConnection>::new(default_database_url());
+    let manager = ConnectionManager::<DbConnection>::new(default_database_url());
 
     let max_size = if env::var("TEST").is_ok() && size > 2 {
         2

src/lib.rs

@@ -45,7 +45,7 @@ pub mod containers;
 pub mod utils;
 
 pub mod auth;
-#[cfg(feature = "pgsql")]
+#[cfg(any(feature = "pgsql", feature = "mysql"))]
 pub mod db_pool;
 
 pub mod server;
@@ -54,14 +54,14 @@ pub mod return_logged;
 
 pub mod threads;
 
-#[cfg(feature = "pgsql")]
+#[cfg(any(feature = "pgsql", feature = "mysql"))]
 pub mod pagination;
 
 pub mod logger;
 
+/// Re-export of `web` from `actix-web` or from `paperclip` if swagger feature enabled.
 #[cfg(not(feature = "swagger"))]
 pub use actix_web::web;
-/// Re-export of `web` from `actix-web` or from `paperclip` if swagger feature enabled.
 #[cfg(feature = "swagger")]
 pub use paperclip::actix::web;
 

src/pagination.rs

@@ -1,8 +1,11 @@
 use diesel::{
-    pg::Pg, prelude::*, query_builder::*, query_dsl::methods::LoadQuery, sql_types::BigInt,
+    prelude::*, query_builder::*, query_dsl::methods::LoadQuery, sql_types::BigInt,
 };
 
 use crate::containers::ListResponse;
+use crate::db_pool::{Db, DbConnection};
+
+
 
 pub trait Paginate: Sized {
     fn paginate(self, page: i64) -> Paginated<Self>;
@@ -41,10 +44,10 @@ impl<T> Paginated<T> {
 
     pub fn load_and_count_pages<'a, U>(
         self,
-        conn: &mut PgConnection,
+        conn: &mut DbConnection,
     ) -> QueryResult<ListResponse<U>>
     where
-        Self: LoadQuery<'a, PgConnection, (U, i64)>,
+        Self: LoadQuery<'a, DbConnection, (U, i64)>,
     {
         let per_page = self.per_page;
         let page = self.page;
@@ -69,13 +72,13 @@ impl<T: Query> Query for Paginated<T> {
     type SqlType = (T::SqlType, BigInt);
 }
 
-impl<T> RunQueryDsl<PgConnection> for Paginated<T> {}
+impl<T> RunQueryDsl<DbConnection> for Paginated<T> {}
 
-impl<T> QueryFragment<Pg> for Paginated<T>
+impl<T> QueryFragment<Db> for Paginated<T>
 where
-    T: QueryFragment<Pg>,
+    T: QueryFragment<Db>,
 {
-    fn walk_ast<'b>(&'b self, mut out: AstPass<'_, 'b, Pg>) -> QueryResult<()> {
+    fn walk_ast<'b>(&'b self, mut out: AstPass<'_, 'b, Db>) -> QueryResult<()> {
         out.push_sql("SELECT *, COUNT(*) OVER () FROM (");
         self.query.walk_ast(out.reborrow())?;
         out.push_sql(") t LIMIT ");

src/server/app_data.rs

@@ -1,13 +1,13 @@
-#[cfg(feature = "pgsql")]
+#[cfg(any(feature = "pgsql", feature = "mysql"))]
 use log::info;
 
 use actix_web::Error;
 use futures::future::{Future, ok as fut_ok};
 use serde::Serialize;
 use std::pin::Pin;
 
-#[cfg(feature = "pgsql")]
-use super::db_pool;
+#[cfg(any(feature = "pgsql", feature = "mysql"))]
+use crate::db_pool;
 
 #[cfg(feature = "prometheus")]
 use super::prometheus::AsPrometheus;
@@ -17,48 +17,48 @@ use super::stats::StatsPresenter;
 /// AppData ready to use if you need only default database connection.
 #[derive(Clone)]
 pub struct DefaultAppData {
-    #[cfg(feature = "pgsql")]
+    #[cfg(any(feature = "pgsql", feature = "mysql"))]
     pub db_pool: db_pool::Pool,
 }
 
-#[cfg(feature = "pgsql")]
+#[cfg(any(feature = "pgsql", feature = "mysql"))]
 pub fn default_app_data() -> DefaultAppData {
     info!("Connecting to database");
     let db_pool = db_pool::init_default_pool().unwrap();
 
     DefaultAppData { db_pool }
 }
 
-#[cfg(not(feature = "pgsql"))]
+#[cfg(all(not(feature = "pgsql"), not(feature = "mysql")))]
 pub fn default_app_data() -> DefaultAppData {
     DefaultAppData { }
 }
 
 
 #[derive(Serialize)]
 pub struct DefaultServiceStats {
-    #[cfg(feature = "pgsql")]
+    #[cfg(any(feature = "pgsql", feature = "mysql"))]
     db_connection: bool,
 }
 
 impl StatsPresenter<DefaultServiceStats> for DefaultAppData {
     fn is_ready(&self) -> Pin<Box<dyn Future<Output=Result<bool, Error>>>> {
-        #[cfg(feature = "pgsql")]
+        #[cfg(any(feature = "pgsql", feature = "mysql"))]
         let res = self.db_pool.get().is_ok();
 
-        #[cfg(not(feature = "pgsql"))]
+        #[cfg(all(not(feature = "pgsql"), not(feature = "mysql")))]
         let res = false;
 
         Box::pin(fut_ok(res))
     }
 
     fn get_stats(&self) -> Pin<Box<dyn Future<Output=Result<DefaultServiceStats, Error>>>> {
-        #[cfg(feature = "pgsql")]
+        #[cfg(any(feature = "pgsql", feature = "mysql"))]
         let db_connection = self.db_pool.get().is_ok();
 
         let fut = fut_ok(
             DefaultServiceStats {
-                #[cfg(feature = "pgsql")]
+                #[cfg(any(feature = "pgsql", feature = "mysql"))]
                 db_connection,
             }
         );
@@ -72,7 +72,7 @@ impl AsPrometheus for DefaultServiceStats {
     fn as_prometheus(&self) -> Vec<String> {
         #![allow(clippy::vec_init_then_push)]
         let mut out = Vec::new();
-        #[cfg(feature = "pgsql")]
+        #[cfg(any(feature = "pgsql", feature = "mysql"))]
         out.push(format!("db_connection {}", self.db_connection as i32));
         out
     }

src/server/mod.rs

@@ -25,10 +25,6 @@ use actix_web::web;
 use paperclip::actix::{web, OpenApiExt};
 
 use super::threads;
-
-#[cfg(feature = "pgsql")]
-use super::db_pool;
-
 use super::logger;
 
 pub use app_data::{DefaultAppData, default_app_data};