Ling0925
/
buster
mirror of https://github.com/buster-so/buster.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix on merge conflict

This commit is contained in:
dal 2025-03-24 13:57:40 -06:00
parent 13938a8140
commit da62ce2222
No known key found for this signature in database
GPG Key ID: 16F4B0E1E9F61122
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/libs/handlers/src/data_sources/update_data_source_handler.rs
View File

@ -175,7 +175,7 @@ pub async fn update_data_source_handler(
.get("default_schema") .get("default_schema")
.and_then(|v| v.as_str()) .and_then(|v| v.as_str())
{ {
updated.default_schema = default_schema.to_string(); updated.default_schema = Some(default_schema.to_string());
} }
if let Some(jump_host) = new_credentials.get("jump_host").and_then(|v| v.as_str()) { if let Some(jump_host) = new_credentials.get("jump_host").and_then(|v| v.as_str()) {
updated.jump_host = Some(jump_host.to_string()); updated.jump_host = Some(jump_host.to_string());
@ -286,7 +286,7 @@ pub async fn update_data_source_handler(
.get("default_schema") .get("default_schema")
.and_then(|v| v.as_str()) .and_then(|v| v.as_str())
{ {
updated.default_schema = default_schema.to_string(); updated.default_schema = Some(default_schema.to_string());
} }
if let Some(jump_host) = new_credentials.get("jump_host").and_then(|v| v.as_str()) { if let Some(jump_host) = new_credentials.get("jump_host").and_then(|v| v.as_str()) {
updated.jump_host = Some(jump_host.to_string()); updated.jump_host = Some(jump_host.to_string());
@ -334,7 +334,7 @@ pub async fn update_data_source_handler(
.get("default_schema") .get("default_schema")
.and_then(|v| v.as_str()) .and_then(|v| v.as_str())
{ {
updated.default_schema = default_schema.to_string(); updated.default_schema = Some(default_schema.to_string());
} }
Credential::Redshift(updated) Credential::Redshift(updated)
@ -363,7 +363,7 @@ pub async fn update_data_source_handler(
.get("default_schema") .get("default_schema")
.and_then(|v| v.as_str()) .and_then(|v| v.as_str())
{ {
updated.default_schema = default_schema.to_string(); updated.default_schema = Some(default_schema.to_string());
} }
Credential::Databricks(updated) Credential::Databricks(updated)
@ -399,7 +399,7 @@ pub async fn update_data_source_handler(
.get("default_schema") .get("default_schema")
.and_then(|v| v.as_str()) .and_then(|v| v.as_str())
{ {
updated.default_schema = default_schema.to_string(); updated.default_schema = Some(default_schema.to_string());
} }
Credential::Snowflake(updated) Credential::Snowflake(updated)