Merge pull request #921 from sanders41/db-manager

Default to asyncpg db manager with no SQLAlchemy option

Author: sanders41

src/cli.rs

@@ -4,9 +4,6 @@ use crate::project_info::{
     Day, DependabotSchedule, LicenseType, ProjectManager, Pyo3PythonManager,
 };
 
-#[cfg(feature = "fastapi")]
-use crate::project_info::{Database, DatabaseManager};
-
 #[derive(Clone, Debug, ValueEnum)]
 pub enum ApplicationOrLib {
     Application,
@@ -178,7 +175,7 @@ pub enum Param {
     /// Remove the is FastAPI project value
     ResetIsFastapiProject,
 
-    #[cfg(feature = "fastapi")]
+    /* #[cfg(feature = "fastapi")]
     /// Save a default database value
     Database { value: Database },
 
@@ -192,8 +189,7 @@ pub enum Param {
 
     #[cfg(feature = "fastapi")]
     /// Remove the database manager value
-    ResetDatabaseManager,
-
+    ResetDatabaseManager, */
     /// Rerset the config to the default values
     Reset,
 

src/config.rs

@@ -14,9 +14,6 @@ use crate::project_info::{
     Pyo3PythonManager,
 };
 
-#[cfg(feature = "fastapi")]
-use crate::project_info::{Database, DatabaseManager};
-
 #[derive(Debug, Deserialize, Serialize, PartialEq, Eq)]
 pub struct Config {
     pub creator: Option<String>,
@@ -42,12 +39,11 @@ pub struct Config {
     #[cfg(feature = "fastapi")]
     pub is_fastapi_project: Option<bool>,
 
-    #[cfg(feature = "fastapi")]
+    /* #[cfg(feature = "fastapi")]
     pub database: Option<Database>,
 
     #[cfg(feature = "fastapi")]
-    pub database_manager: Option<DatabaseManager>,
-
+    pub database_manager: Option<DatabaseManager>, */
     #[serde(skip)]
     config_dir: Rc<Option<PathBuf>>,
     #[serde(skip)]
@@ -81,12 +77,11 @@ impl Default for Config {
 
             #[cfg(feature = "fastapi")]
             is_fastapi_project: None,
-
-            #[cfg(feature = "fastapi")]
+            /* #[cfg(feature = "fastapi")]
             database: None,
 
             #[cfg(feature = "fastapi")]
-            database_manager: None,
+            database_manager: None, */
         }
     }
 }
@@ -123,12 +118,11 @@ impl Config {
 
                             #[cfg(feature = "fastapi")]
                             is_fastapi_project: config.is_fastapi_project,
-
-                            #[cfg(feature = "fastapi")]
+                            /* #[cfg(feature = "fastapi")]
                             database: config.database,
 
                             #[cfg(feature = "fastapi")]
-                            database_manager: config.database_manager,
+                            database_manager: config.database_manager, */
                         };
                     }
                 }
@@ -410,7 +404,7 @@ impl Config {
         Ok(())
     }
 
-    #[cfg(feature = "fastapi")]
+    /* #[cfg(feature = "fastapi")]
     pub fn save_database(&self, value: Database) -> Result<()> {
         self.handle_save_config(|config| &mut config.database, Some(value))?;
         Ok(())
@@ -432,7 +426,7 @@ impl Config {
     pub fn reset_database_manager(&self) -> Result<()> {
         self.handle_save_config(|config| &mut config.database_manager, None)?;
         Ok(())
-    }
+    } */
 
     pub fn show(&self) {
         let config = self.load_config();
@@ -990,7 +984,7 @@ mod tests {
         assert_eq!(result.is_fastapi_project, None);
     }
 
-    #[cfg(feature = "fastapi")]
+    /* #[cfg(feature = "fastapi")]
     #[test]
     fn test_save_database() {
         let config = mock_config();
@@ -1034,5 +1028,5 @@ mod tests {
         let result = config.load_config();
 
         assert_eq!(result.database_manager, None);
-    }
+    } */
 }

src/fastapi/fastapi_installer.rs

@@ -1,6 +1,6 @@
 use anyhow::{bail, Result};
 
-use crate::project_info::{DatabaseManager, ProjectInfo, ProjectManager};
+use crate::project_info::{ProjectInfo, ProjectManager};
 
 const FASTAPI_BASE_DEPENDENCIES: &[&str] = &[
     "asyncpg",
@@ -34,11 +34,11 @@ pub fn install_fastapi_dependencies(project_info: &ProjectInfo) -> Result<()> {
 }
 
 fn uv_fastapi_depencency_installer(project_info: &ProjectInfo) -> Result<()> {
-    let mut dependencies = FASTAPI_BASE_DEPENDENCIES.to_vec();
-    if project_info.database_manager == Some(DatabaseManager::SqlAlchemy) {
+    let dependencies = FASTAPI_BASE_DEPENDENCIES.to_vec();
+    /* if project_info.database_manager == Some(DatabaseManager::SqlAlchemy) {
         dependencies.push("sqlalchemy");
         dependencies.push("alembic");
-    }
+    } */
     let mut args = vec!["add"];
     args.extend(dependencies);
     let output = std::process::Command::new("uv")
@@ -68,11 +68,11 @@ fn uv_fastapi_depencency_installer(project_info: &ProjectInfo) -> Result<()> {
 }
 
 fn poetry_fastapi_depencency_installer(project_info: &ProjectInfo) -> Result<()> {
-    let mut dependencies = FASTAPI_BASE_DEPENDENCIES.to_vec();
-    if project_info.database_manager == Some(DatabaseManager::SqlAlchemy) {
+    let dependencies = FASTAPI_BASE_DEPENDENCIES.to_vec();
+    /* if project_info.database_manager == Some(DatabaseManager::SqlAlchemy) {
         dependencies.push("sqlalchemy");
         dependencies.push("alembic");
-    }
+    } */
     let mut args = vec!["add"];
     args.extend(dependencies);
     let output = std::process::Command::new("poetry")
@@ -112,12 +112,12 @@ fn setuptools_fastapi_depencency_installer(project_info: &ProjectInfo) -> Result
         bail!("Failed to create virtual environment: {stderr}");
     }
 
-    let mut dependencies = FASTAPI_BASE_DEPENDENCIES.to_vec();
+    let dependencies = FASTAPI_BASE_DEPENDENCIES.to_vec();
     let dev_dependencies = FASTAPI_BASE_DEV_DEPENDENCIES.to_vec();
-    if project_info.database_manager == Some(DatabaseManager::SqlAlchemy) {
+    /* if project_info.database_manager == Some(DatabaseManager::SqlAlchemy) {
         dependencies.push("sqlalchemy");
         dependencies.push("alembic");
-    }
+    } */
     let mut args = vec!["-m", "pip", "install"];
     args.extend(dependencies);
     args.extend(dev_dependencies);

src/main.rs

@@ -428,7 +428,7 @@ fn main() {
                 }
             }
 
-            #[cfg(feature = "fastapi")]
+            /* #[cfg(feature = "fastapi")]
             Param::Database { value } => {
                 if let Err(e) = Config::default().save_database(value) {
                     print_error(e);
@@ -458,8 +458,7 @@ fn main() {
                     print_error(e);
                     exit(1);
                 }
-            }
-
+            } */
             Param::Reset => {
                 if Config::reset().is_err() {
                     let message = "Error resetting config.";

src/project_info.rs

@@ -135,15 +135,15 @@ impl fmt::Display for Database {
 pub enum DatabaseManager {
     #[default]
     AsyncPg,
-    SqlAlchemy,
+    // SqlAlchemy,
 }
 
 #[cfg(feature = "fastapi")]
 impl fmt::Display for DatabaseManager {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
             Self::AsyncPg => write!(f, "asyncpg"),
-            Self::SqlAlchemy => write!(f, "SQLAlchemy"),
+            // Self::SqlAlchemy => write!(f, "SQLAlchemy"),
         }
     }
 }