refac: restructure database

migra-cli/src/commands/apply.rs

@@ -1,5 +1,6 @@
 use crate::config::Config;
-use crate::migration::{DatabaseMigrationManager, MigrationManager};
+use crate::database::prelude::*;
+use crate::database::MigrationManager;
 use crate::opts::ApplyCommandOpt;
 use crate::StdResult;
 use std::convert::TryFrom;

migra-cli/src/commands/downgrade.rs

@@ -1,5 +1,6 @@
 use crate::config::Config;
-use crate::migration::{DatabaseMigrationManager, MigrationManager};
+use crate::database::prelude::*;
+use crate::database::MigrationManager;
 use crate::StdResult;
 use std::convert::TryFrom;
 

migra-cli/src/commands/init.rs

@@ -1,5 +1,4 @@
-use crate::config::Config;
+use crate::config::{Config, MIGRA_TOML_FILENAME};
-use crate::config::MIGRA_TOML_FILENAME;
 use crate::StdResult;
 use std::path::PathBuf;
 

migra-cli/src/commands/list.rs

@@ -1,9 +1,8 @@
 use crate::config::Config;
-use crate::databases::*;
+use crate::database::migration::filter_pending_migrations;
+use crate::database::prelude::*;
+use crate::database::{DatabaseConnectionManager, Migration, MigrationManager};
 use crate::error::{Error, StdResult};
-use crate::migration::{
-    filter_pending_migrations, DatabaseMigrationManager, Migration, MigrationManager,
-};
 
 const EM_DASH: char = '—';
 

migra-cli/src/commands/upgrade.rs

@@ -1,6 +1,4 @@
-use crate::migration::{
+use crate::database::migration::*;
-    filter_pending_migrations, DatabaseMigrationManager, Migration, MigrationManager,
-};
 use crate::Config;
 use crate::StdResult;
 use std::convert::TryFrom;

migra-cli/src/config.rs

@@ -1,5 +1,5 @@
+use crate::database::migration::Migration;
 use crate::error::{Error, MigraResult};
-use crate::migration::Migration;
 use serde::{Deserialize, Serialize};
 use std::path::{Path, PathBuf};
 use std::{env, fs, io};

migra-cli/src/database/adapter.rs

@@ -0,0 +1,17 @@
+use crate::error::StdResult;
+
+pub trait ToSql {
+    fn to_sql(&self) -> String;
+}
+
+pub type ToSqlParams<'a> = &'a [&'a dyn ToSql];
+
+impl ToSql for &str {
+    fn to_sql(&self) -> String {
+        format!("'{}'", self)
+    }
+}
+
+pub trait TryFromSql<QueryResultRow>: Sized {
+    fn try_from_sql(row: QueryResultRow) -> StdResult<Self>;
+}

migra-cli/src/database/builder.rs

@@ -1,32 +1,4 @@
-use crate::StdResult;
+use super::prelude::*;
-
-pub trait ToSql {
-    fn to_sql(&self) -> String;
-}
-
-pub type ToSqlParams<'a> = &'a [&'a dyn ToSql];
-
-impl ToSql for &str {
-    fn to_sql(&self) -> String {
-        format!("'{}'", self)
-    }
-}
-
-pub trait TryFromSql<QueryResultRow>: Sized {
-    fn try_from_sql(row: QueryResultRow) -> StdResult<Self>;
-}
-
-pub trait OpenDatabaseConnection: Sized {
-    fn open(connection_string: &str) -> StdResult<Self>;
-}
-
-pub trait DatabaseConnection {
-    fn batch_execute(&mut self, query: &str) -> StdResult<()>;
-
-    fn execute<'b>(&mut self, query: &str, params: ToSqlParams<'b>) -> StdResult<u64>;
-
-    fn query<'b>(&mut self, query: &str, params: ToSqlParams<'b>) -> StdResult<Vec<Vec<String>>>;
-}
 
 pub(crate) fn merge_query_with_params(query: &str, params: ToSqlParams) -> String {
     params

migra-cli/src/database/clients/mod.rs

@@ -0,0 +1,3 @@
+mod postgres;
+
+pub use self::postgres::*;

migra-cli/src/database/clients/postgres.rs

@@ -1,4 +1,5 @@
-use crate::database::*;
+use crate::database::builder::merge_query_with_params;
+use crate::database::prelude::*;
 use crate::error::StdResult;
 use postgres::{Client, NoTls};
 

migra-cli/src/database/connection.rs

@@ -1,11 +1,20 @@
-mod postgres;
+use super::adapter::ToSqlParams;
-
+use super::clients::*;
-pub use self::postgres::*;
-
 use crate::config::{DatabaseConfig, SupportedDatabaseClient};
-use crate::database::{DatabaseConnection, OpenDatabaseConnection};
 use crate::error::StdResult;
 
+pub trait OpenDatabaseConnection: Sized {
+    fn open(connection_string: &str) -> StdResult<Self>;
+}
+
+pub trait DatabaseConnection {
+    fn batch_execute(&mut self, query: &str) -> StdResult<()>;
+
+    fn execute<'b>(&mut self, query: &str, params: ToSqlParams<'b>) -> StdResult<u64>;
+
+    fn query<'b>(&mut self, query: &str, params: ToSqlParams<'b>) -> StdResult<Vec<Vec<String>>>;
+}
+
 pub(crate) struct DatabaseConnectionManager {
     config: DatabaseConfig,
 }

migra-cli/src/database/migration.rs

@@ -1,6 +1,5 @@
+use super::connection::{DatabaseConnection, DatabaseConnectionManager};
 use crate::config::Config;
-use crate::database::DatabaseConnection;
-use crate::databases::DatabaseConnectionManager;
 use crate::StdResult;
 use std::convert::TryFrom;
 use std::fs;

migra-cli/src/database/mod.rs

@@ -0,0 +1,14 @@
+pub(crate) mod adapter;
+pub(crate) mod builder;
+pub(crate) mod clients;
+pub(crate) mod connection;
+pub(crate) mod migration;
+
+pub mod prelude {
+    pub use super::adapter::{ToSql, ToSqlParams, TryFromSql};
+    pub use super::connection::{DatabaseConnection, OpenDatabaseConnection};
+    pub use super::migration::DatabaseMigrationManager;
+}
+
+pub(crate) use connection::DatabaseConnectionManager;
+pub(crate) use migration::{Migration, MigrationManager};

migra-cli/src/main.rs

@@ -4,9 +4,7 @@
 mod commands;
 mod config;
 mod database;
-mod databases;
 mod error;
-mod migration;
 mod opts;
 
 use crate::error::StdResult;