Skip to content

Commit

Permalink
Trying to rebuild the process for auth 2
Browse files Browse the repository at this point in the history
  • Loading branch information
TheRustifyer committed Apr 11, 2023
1 parent e2b58f1 commit 8dd82d3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion canyon_connection/src/canyon_database_connector.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ impl DatabaseConnection {
crate::datasources::SqlServerAuth::Basic { username, password } => {

Check failure on line 95 in canyon_connection/src/canyon_database_connector.rs

View workflow job for this annotation

GitHub Actions / Verify code formatting

Diff in /home/runner/work/Canyon-SQL/Canyon-SQL/canyon_connection/src/canyon_database_connector.rs
AuthMethod::sql_server(username, password)
}
crate::datasources::SqlServerAuth::Integrated => AuthMethod::Integrated
crate::datasources::SqlServerAuth::IntegratedAuth => AuthMethod::Integrated
},
});

Expand Down
4 changes: 2 additions & 2 deletions canyon_connection/src/datasources.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ fn load_ds_config_from_array() {
assert_eq!(ds_1.properties.db_name, "triforce2");
assert_eq!(ds_1.properties.migrations, Some(Migrations::Disabled));

assert_eq!(ds_2.auth, Auth::SqlServer(SqlServerAuth::Integrated))
assert_eq!(ds_2.auth, Auth::SqlServer(SqlServerAuth::IntegratedAuth))
}
///
#[derive(Deserialize, Debug, Clone)]
Expand Down Expand Up @@ -96,7 +96,7 @@ pub enum SqlServerAuth {
#[serde(alias = "Basic", alias = "basic")]
Basic { username: String, password: String },
#[serde(alias = "Integrated", alias = "integrated")]
Integrated,
IntegratedAuth,
}

#[derive(Deserialize, Debug, Clone)]
Expand Down

0 comments on commit 8dd82d3

Please sign in to comment.