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

Merge pull request #351 from buster-so/staging 

refactor: improve data type handling in Redshift query processing
This commit is contained in:
dal 2025-06-07 14:29:14 -07:00 committed by GitHub
parent 993929720e 2f78c11cf0
commit ffa4d5fd41
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -71,3 +71,5 @@ node_modules/
web/playwright-tests/auth-utils/auth.json web/playwright-tests/auth-utils/auth.json
**/.claude/settings.local.json **/.claude/settings.local.json
**/*.private.*

42
api/libs/query_engine/src/data_source_query_routes/redshift_query.rs
View File

@ -30,30 +30,30 @@ pub async fn redshift_query(
for (i, column) in row.columns().iter().enumerate() { for (i, column) in row.columns().iter().enumerate() {
let column_name = column.name(); let column_name = column.name();
let type_info = column.type_info().clone().to_string(); let type_info = column.type_info().clone().to_string();
let column_value = match type_info.as_str() { let column_value = match type_info.as_str() {
"BOOL" => DataType::Bool(Some(row.get::<bool, _>(i))), "BOOL" => DataType::Bool(row.try_get::<Option<bool>, _>(i).unwrap_or(None)),
"BYTEA" => DataType::Bytea(Some(row.get::<Vec<u8>, _>(i))), "BYTEA" => DataType::Bytea(row.try_get::<Option<Vec<u8>>, _>(i).unwrap_or(None)),
"CHAR" => DataType::Char(Some(row.get::<String, _>(i))), "CHAR" => DataType::Char(row.try_get::<Option<String>, _>(i).unwrap_or(None)),
"INT8" => DataType::Int8(Some(row.get::<i64, _>(i))), "INT8" => DataType::Int8(row.try_get::<Option<i64>, _>(i).unwrap_or(None)),
"INT4" => DataType::Int4(Some(row.get::<i32, _>(i))), "INT4" => DataType::Int4(row.try_get::<Option<i32>, _>(i).unwrap_or(None)),
"INT2" => DataType::Int2(Some(row.get::<i16, _>(i))), "INT2" => DataType::Int2(row.try_get::<Option<i16>, _>(i).unwrap_or(None)),
"TEXT" | "VARCHAR" => DataType::Text(Some(row.get::<String, _>(i))), "TEXT" | "VARCHAR" => DataType::Text(row.try_get::<Option<String>, _>(i).unwrap_or(None)),
"FLOAT4" => DataType::Float4(Some(row.get::<f32, _>(i))), "FLOAT4" => DataType::Float4(row.try_get::<Option<f32>, _>(i).unwrap_or(None)),
"FLOAT8" => DataType::Float8(Some(row.get::<f64, _>(i))), "FLOAT8" => DataType::Float8(row.try_get::<Option<f64>, _>(i).unwrap_or(None)),
"NUMERIC" => { "NUMERIC" => {
let value: BigDecimal = row.get::<BigDecimal, _>(i); match row.try_get::<Option<BigDecimal>, _>(i).unwrap_or(None) {
let value: f64 = value.to_f64().unwrap(); Some(value) => DataType::Float8(value.to_f64()),
DataType::Float8(Some(value)) None => DataType::Float8(None),
}
} }
"UUID" => DataType::Uuid(Some(row.get::<uuid::Uuid, _>(i))), "UUID" => DataType::Uuid(row.try_get::<Option<uuid::Uuid>, _>(i).unwrap_or(None)),
"TIMESTAMP" => DataType::Timestamp(Some(row.get::<chrono::NaiveDateTime, _>(i))), "TIMESTAMP" => DataType::Timestamp(row.try_get::<Option<chrono::NaiveDateTime>, _>(i).unwrap_or(None)),
"DATE" => DataType::Date(Some(row.get::<chrono::NaiveDate, _>(i))), "DATE" => DataType::Date(row.try_get::<Option<chrono::NaiveDate>, _>(i).unwrap_or(None)),
"TIME" => DataType::Time(Some(row.get::<chrono::NaiveTime, _>(i))), "TIME" => DataType::Time(row.try_get::<Option<chrono::NaiveTime>, _>(i).unwrap_or(None)),
"TIMESTAMPTZ" => { "TIMESTAMPTZ" => DataType::Timestamptz(row.try_get::<Option<chrono::DateTime<Utc>>, _>(i).unwrap_or(None)),
DataType::Timestamptz(Some(row.get::<chrono::DateTime<Utc>, _>(i))) "JSON" | "JSONB" => DataType::Json(row.try_get::<Option<serde_json::Value>, _>(i).unwrap_or(None)),
} _ => DataType::Unknown(row.try_get::<Option<String>, _>(i).unwrap_or(None)),
"JSON" | "JSONB" => DataType::Json(Some(row.get::<serde_json::Value, _>(i))),
_ => DataType::Unknown(Some(row.get::<String, _>(i))),
}; };
row_map.insert(column_name.to_string(), column_value); row_map.insert(column_name.to_string(), column_value);