Fixed features

Author: gammelalf

Cargo.toml

@@ -22,7 +22,7 @@ path = "src/main.rs"
 [dependencies]
 # Internal dependencies
 rorm-declaration = { version = "~0.3", path = "../rorm-declaration" }
-rorm-sql = { version = "~0.7", path = "../rorm-sql", features = ["sqlite", "mysql", "postgres"] }
+rorm-sql = { version = "~0.7", path = "../rorm-sql" }
 rorm-db = { version = "0.8.1", path = "../rorm-db" }
 
 # CLI parsing tool
@@ -58,9 +58,28 @@ temp-dir = { version = "~0.1" }
 [features]
 default = [
     "tokio",
+    "sqlite",
+    "mysql",
+    "postgres",
 ]
 
 tokio = [
     "dep:tokio",
     "rorm-db/tokio",
+]
+
+sqlite = [
+    "rorm-db/sqlite",
+    "rorm-declaration/sqlite",
+    "rorm-sql/sqlite",
+]
+mysql = [
+    "rorm-db/mysql",
+    "rorm-declaration/mysql",
+    "rorm-sql/mysql",
+]
+postgres = [
+    "rorm-db/postgres",
+    "rorm-declaration/postgres",
+    "rorm-sql/postgres",
 ]

src/entry.rs

@@ -7,13 +7,15 @@ use crate::squash_migrations::squash_migrations;
 
 #[derive(Subcommand)]
 pub enum InitDriver {
+    #[cfg(feature = "sqlite")]
     #[clap(about = "Initialize a sqlite configuration")]
     Sqlite {
         #[clap(long = "filename")]
         #[clap(default_value_t = String::from("db.sqlite3"))]
         #[clap(help = "Name of the sqlite file.")]
         filename: String,
     },
+    #[cfg(feature = "mysql")]
     #[clap(about = "Initialize a mysql configuration")]
     Mysql {
         #[clap(long = "host")]
@@ -43,6 +45,7 @@ pub enum InitDriver {
         #[clap(help = "The name of the database to connect to.")]
         name: String,
     },
+    #[cfg(feature = "postgres")]
     #[clap(about = "Initialize a postgres configuration")]
     Postgres {
         #[clap(long = "host")]

src/init/mod.rs

@@ -8,6 +8,7 @@ use rorm_declaration::config::{DatabaseConfig, DatabaseDriver};
 use crate::entry::InitDriver;
 use crate::migrate::config::DatabaseConfigFile;
 
+/// Create the database configuration file
 pub fn init(database_configuration: String, driver: InitDriver, force: bool) -> anyhow::Result<()> {
     let p = Path::new(&database_configuration);
     if p.exists() && !force {
@@ -16,6 +17,7 @@ pub fn init(database_configuration: String, driver: InitDriver, force: bool) ->
     }
 
     match driver {
+        #[cfg(feature = "sqlite")]
         InitDriver::Sqlite { filename } => {
             let config_file = DatabaseConfigFile {
                 database: DatabaseConfig {
@@ -31,6 +33,7 @@ pub fn init(database_configuration: String, driver: InitDriver, force: bool) ->
 
             println!("Configuration was written to {}.", &database_configuration);
         }
+        #[cfg(feature = "mysql")]
         InitDriver::Mysql {
             host,
             port,
@@ -65,6 +68,7 @@ pub fn init(database_configuration: String, driver: InitDriver, force: bool) ->
 
             println!("Configuration was written to {}.", &database_configuration);
         }
+        #[cfg(feature = "postgres")]
         InitDriver::Postgres {
             host,
             port,

src/migrate/mod.rs

@@ -4,7 +4,7 @@ use std::path::Path;
 use anyhow::{anyhow, Context};
 use rorm_db::executor::{Executor, Nothing, Optional};
 use rorm_db::Database;
-use rorm_declaration::config::{DatabaseConfig, DatabaseDriver};
+use rorm_declaration::config::DatabaseConfig;
 use rorm_declaration::imr::{Annotation, DbType};
 use rorm_declaration::migration::Migration;
 use rorm_sql::create_table::CreateTable;
@@ -282,13 +282,6 @@ pub async fn run_migrate(options: MigrateOptions) -> anyhow::Result<()> {
 
     let db_conf = deserialize_db_conf(db_conf_path)?;
 
-    if let DatabaseDriver::SQLite { filename } = &db_conf.driver {
-        if filename.is_empty() {
-            println!("Invalid configuration: Filename for sqlite is empty");
-            return Ok(());
-        }
-    }
-
     run_migrate_custom(
         db_conf,
         options.migration_dir,

src/migrate/sql_builder.rs

@@ -110,18 +110,22 @@ pub async fn migration_to_sql<'a>(
                     execute_statement(tx, query_string, query_bind_params, do_log).await?;
                 }
             }
+            #[allow(unused_variables)]
             Operation::RawSQL {
                 mysql,
                 postgres,
                 sqlite,
                 ..
             } => match db_impl {
+                #[cfg(feature = "sqlite")]
                 DBImpl::SQLite => {
                     execute_statement(tx, sqlite.clone(), Vec::new(), do_log).await?;
                 }
+                #[cfg(feature = "postgres")]
                 DBImpl::Postgres => {
                     execute_statement(tx, postgres.clone(), Vec::new(), do_log).await?;
                 }
+                #[cfg(feature = "mysql")]
                 DBImpl::MySQL => {
                     execute_statement(tx, mysql.clone(), Vec::new(), do_log).await?;
                 }