Skip to content

Apache DataFusion SQL Query Engine

Fix ORDER BY positional reference regression with aliased aggregates (#19412)

Adrian Garcia Badaraccob3d2cb622c64
diff --git a/datafusion/sql/src/select.rs b/datafusion/sql/src/select.rs
index cbcc6c3e10..1d6ccde6be 100644
--- a/datafusion/sql/src/select.rs
+++ b/datafusion/sql/src/select.rs
@@ -29,8 +29,8 @@ use crate::utils::{
use datafusion_common::error::DataFusionErrorBuilder;
use datafusion_common::tree_node::{TreeNode, TreeNodeRecursion};
+use datafusion_common::{Column, Result, not_impl_err, plan_err};
use datafusion_common::{RecursionUnnestOption, UnnestOptions};
-use datafusion_common::{Result, not_impl_err, plan_err};
use datafusion_expr::expr::{Alias, PlannedReplaceSelectItem, WildcardOptions};
use datafusion_expr::expr_rewriter::{
normalize_col, normalize_col_with_schemas_and_ambiguity_check, normalize_sorts,
@@ -1054,7 +1054,9 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
&& alias.expr.as_ref() == &rewritten_expr
{
// Use the alias name
- return Some(Expr::Column(alias.name.clone().into()));
+ return Some(Expr::Column(Column::new_unqualified(
+ alias.name.clone(),
+ )));
}
None
})
@@ -1069,7 +1071,7 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
.cloned()
.chain(select_exprs_post_aggr.iter().filter_map(|e| {
if let Expr::Alias(alias) = e {
- Some(Expr::Column(alias.name.clone().into()))
+ Some(Expr::Column(Column::new_unqualified(alias.name.clone())))
} else {
None
}
diff --git a/datafusion/sqllogictest/test_files/order.slt b/datafusion/sqllogictest/test_files/order.slt
index 62579ea1cd..7c857cae36 100644
--- a/datafusion/sqllogictest/test_files/order.slt
+++ b/datafusion/sqllogictest/test_files/order.slt
@@ -444,6 +444,17 @@ select column1 from foo group by column1 order by min(column2), max(column2);
3
5
+# Test GROUP BY alias with ORDER BY column index
+# Regression test: GROUP BY an aliased column, ORDER BY using column index
+query TI
+with t as (select 'foo' as x)
+select x, count(*) as "Count"
+from t
+group by x
+order by 2 desc;
+----
+foo 1
+
# Test issue: https://github.com/apache/datafusion/issues/11549
query I
select column1 from foo order by log(column2);