Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion taitan-orm/src/database/mysql/database.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use super::transaction::MySqlTransaction;

use sqlx::{MySql, MySqlPool};
use sqlx::{MySql, MySqlPool, PgPool};
use taitan_orm_trait::result::Result;
use taitan_orm_trait::result::CountResult;
use crate::executors::SqlExecutor;
Expand All @@ -21,6 +21,10 @@ impl MySqlDatabase {
pub fn get_pool(&self) -> Result<&MySqlPool> {
Ok(&self.pool)
}

pub fn from_pool(pool: MySqlPool) -> Self {
Self { pool }
}
}

impl SqlGenericExecutor for MySqlDatabase {
Expand Down
9 changes: 6 additions & 3 deletions taitan-orm/src/database/postgres/database.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
use super::transaction::PostgresTransaction;
use taitan_orm_trait::result::CountResult;
use crate::brave_new_executor_impl;
use crate::executors::SqlExecutor;
use crate::executors::SqlGenericExecutor;
use sqlx::PgPool;
use sqlx::Postgres;
use taitan_orm_trait::result::CountResult;
use taitan_orm_trait::result::Result;
use crate::executors::SqlExecutor;

#[derive(Debug, Clone)]
pub struct PostgresDatabase {
Expand All @@ -22,6 +22,10 @@ impl PostgresDatabase {
pub fn get_pool(&self) -> Result<&PgPool> {
Ok(&self.pool)
}

pub fn from_pool(pool: PgPool) -> Self {
Self { pool }
}
}

impl SqlGenericExecutor for PostgresDatabase {
Expand All @@ -33,7 +37,6 @@ impl SqlGenericExecutor for PostgresDatabase {
}
}


impl SqlExecutor<Postgres> for PostgresDatabase {
brave_new_executor_impl!(sqlx::Postgres);
}
10 changes: 6 additions & 4 deletions taitan-orm/src/database/sqlite/database.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
use super::transaction::SqliteTransaction;
use crate::brave_new_executor_impl;
use taitan_orm_trait::result::CountResult;
use crate::executors::SqlExecutor;
use crate::executors::SqlGenericExecutor;
use sqlx::SqlitePool;
use sqlx::Sqlite;
use sqlx::SqlitePool;
use taitan_orm_trait::result::CountResult;
use taitan_orm_trait::result::Result;

#[derive(Debug, Clone)]
Expand All @@ -22,8 +22,11 @@ impl SqliteDatabase {
pub fn get_pool(&self) -> Result<&SqlitePool> {
Ok(&self.sqlite_pool)
}
}

pub fn from_pool(pool: SqlitePool) -> Self {
Self { sqlite_pool: pool }
}
}

impl SqlGenericExecutor for SqliteDatabase {
type DB = Sqlite;
Expand All @@ -34,7 +37,6 @@ impl SqlGenericExecutor for SqliteDatabase {
}
}


impl SqlExecutor<Sqlite> for SqliteDatabase {
brave_new_executor_impl!(sqlx::Sqlite);
}