Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions src/planner_v2/binder/expression/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,13 @@ impl BoundExpression {
BoundExpression::BoundCastExpression(expr) => expr.base.alias.clone(),
}
}

pub fn set_alias(&mut self, alias: String) {
match self {
BoundExpression::BoundColumnRefExpression(expr) => expr.base.alias = alias,
BoundExpression::BoundConstantExpression(expr) => expr.base.alias = alias,
BoundExpression::BoundReferenceExpression(expr) => expr.base.alias = alias,
BoundExpression::BoundCastExpression(expr) => expr.base.alias = alias,
}
}
}
15 changes: 12 additions & 3 deletions src/planner_v2/binder/query_node/bind_select_node.rs
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,18 @@ impl Binder {
sqlparser::ast::SelectItem::UnnamedExpr(expr) => {
expr_binder.bind_expression(expr, result_names, result_types)
}
sqlparser::ast::SelectItem::ExprWithAlias { .. } => todo!(),
sqlparser::ast::SelectItem::Wildcard(_) => todo!(),
sqlparser::ast::SelectItem::QualifiedWildcard(_, _) => todo!(),
sqlparser::ast::SelectItem::ExprWithAlias { expr, alias } => {
let mut expr = expr_binder.bind_expression(expr, result_names, result_types)?;
expr.set_alias(alias.to_string());
if let Some(last_name) = result_names.last_mut() {
*last_name = alias.to_string();
}
Ok(expr)
}
sqlparser::ast::SelectItem::Wildcard(..)
| sqlparser::ast::SelectItem::QualifiedWildcard(..) => Err(BindError::Internal(
"wildcard should expand before bind select item".to_string(),
)),
}
}
}
9 changes: 9 additions & 0 deletions tests/slt/select.slt
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,12 @@ select *, t1.* from t1;
----
1 4 0 1 4 0
2 5 1 2 5 1


# TODO: use alias function to verify output column names
onlyif sqlrs_v2
query III
select t.v1 as a, v2 as b from t1 as t;
----
1 4
2 5