Skip to content

Error in MySql implementation detail, related to features configuration, in From<&Auth> for DatabaseType #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheRustifyer merged 6 commits into from
May 8, 2024
Merged

Error in MySql implementation detail, related to features configuration, in From<&Auth> for DatabaseType #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fafdd2f
changes: impl From<&Auth> for DatabaseType
0nSystem Apr 28, 2024
4f6e7b0
changes: correction cargo fmt
0nSystem May 1, 2024
7821483
Merge branch 'main' into bugfix/GH-60-error-in-mysql-implementation-d…
0nSystem May 1, 2024
c23fc11
changes: remove panic From<&Auth>
0nSystem May 7, 2024
c7ee6f9
changes: remove doc empty
0nSystem May 7, 2024
953dea8
changes: cargo fmt
0nSystem May 7, 2024
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
3 changes: 3 additions & 0 deletions canyon_connection/src/canyon_database_connector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
}
Expand Down
2 changes: 1 addition & 1 deletion canyon_connection/src/datasources.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion canyon_connection/src/lib.rs
View file
Open in desktop
Original file line number Diff 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