Skip to content
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

fix: column expression rewrite #37

Merged
merged 1 commit into from
Jan 4, 2025
Merged

fix: column expression rewrite #37

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 13 additions & 12 deletions sources/sql/src/rewrite/plan.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ fn rewrite_column_name_in_expr(

// Table name same as column name
// Shouldn't rewrite in this case
if idx == 0 && start_pos == 0 {
if idx == 0 && table_ref_str.len() == col_name.len() {
return None;
}

Expand Down Expand Up @@ -1367,14 +1367,21 @@ mod tests {
}

#[tokio::test]
async fn test_rewrite_same_column_table_name() -> Result<()> {
async fn test_rewrite_column_name_in_expr() -> Result<()> {
init_tracing();
let ctx = get_test_df_context();

let tests = vec![(
"SELECT app_table FROM (SELECT a app_table from app_table limit 100);",
r#"SELECT app_table FROM (SELECT remote_table.a AS app_table FROM remote_table LIMIT 100)"#,
)];
let tests = vec![
(
// Column alias name same as table name
"SELECT app_table FROM (SELECT a app_table from app_table limit 100);",
r#"SELECT app_table FROM (SELECT remote_table.a AS app_table FROM remote_table LIMIT 100)"#,
),
(
"SELECT a - 1, COUNT(*) AS c FROM app_table GROUP BY a - 1;",
r#"SELECT (remote_table.a - 1), count(*) AS c FROM remote_table GROUP BY (remote_table.a - 1)"#,
),
];

for test in tests {
test_sql(&ctx, test.0, test.1, false).await?;
Expand All @@ -1391,8 +1398,6 @@ mod tests {
) -> Result<(), datafusion::error::DataFusionError> {
let data_frame = ctx.sql(sql_query).await?;

// println!("before optimization: \n{:#?}", data_frame.logical_plan());

let mut known_rewrites = HashMap::new();
let rewritten_plan = rewrite_table_scans(
data_frame.logical_plan(),
Expand All @@ -1401,12 +1406,8 @@ mod tests {
&mut None,
)?;

// println!("rewritten_plan: \n{:#?}", rewritten_plan);

let unparsed_sql = plan_to_sql(&rewritten_plan)?;

println!("unparsed_sql: \n{unparsed_sql}");

assert_eq!(
format!("{unparsed_sql}"),
expected_sql,
Expand Down
Loading