Error in MySql implementation detail, related to features configurati…

…on, in From<&Auth> for DatabaseType (#61) * changes: impl From<&Auth> for DatabaseType * changes: correction cargo fmt * changes: remove panic From<&Auth> * changes: remove doc empty * changes: cargo fmt
zerodaycode · May 8, 2024 · b855518 · b855518
1 parent 3fbd814
commit b855518
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/canyon_connection/src/canyon_database_connector.rs b/canyon_connection/src/canyon_database_connector.rs
@@ -28,8 +28,11 @@ pub enum DatabaseType {
 impl From<&Auth> for DatabaseType {
     fn from(value: &Auth) -> Self {
         match value {
+            #[cfg(feature = "postgres")]
             crate::datasources::Auth::Postgres(_) => DatabaseType::PostgreSql,
+            #[cfg(feature = "mssql")]
             crate::datasources::Auth::SqlServer(_) => DatabaseType::SqlServer,
+            #[cfg(feature = "mysql")]
             crate::datasources::Auth::MySQL(_) => DatabaseType::MySQL,
         }
     }

diff --git a/canyon_connection/src/datasources.rs b/canyon_connection/src/datasources.rs
@@ -92,7 +92,7 @@ fn load_ds_config_from_array() {
         assert_eq!(ds_1.properties.migrations, Some(Migrations::Disabled));
     }
 }
-///
+
 #[derive(Deserialize, Debug, Clone)]
 pub struct CanyonSqlConfig {
     pub canyon_sql: Datasources,

diff --git a/canyon_connection/src/lib.rs b/canyon_connection/src/lib.rs
@@ -85,7 +85,6 @@ pub async fn init_connections_cache() {
     }
 }
 
-///
 pub fn get_database_connection<'a>(
     datasource_name: &str,
     guarded_cache: &'a mut MutexGuard<IndexMap<&str, DatabaseConnection>>,
-Original file line number
+Diff line change
@@ Expand Up / @@ -85,7 +85,6 @@ pub async fn init_connections_cache() { @@
         }
     }
-    ///
     pub fn get_database_connection<'a>(
         datasource_name: &str,
         guarded_cache: &'a mut MutexGuard<IndexMap<&str, DatabaseConnection>>,
@@ Expand Down @@