From 56b15193d08374fa27b2df557e4d370d67b84de0 Mon Sep 17 00:00:00 2001
From: jussisaurio <jussi.saurio@gmail.com>
Date: Sun, 24 Nov 2024 21:20:55 +0200
Subject: [PATCH] resolve aggregates from orderby as well

---
 core/translate/planner.rs |  6 ++++++
 testing/orderby.test      | 15 ++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/core/translate/planner.rs b/core/translate/planner.rs
index 02bf9cdcd..c2c5aa115 100644
--- a/core/translate/planner.rs
+++ b/core/translate/planner.rs
@@ -20,6 +20,9 @@ impl OperatorIdCounter {
 }
 
 fn resolve_aggregates(expr: &ast::Expr, aggs: &mut Vec<Aggregate>) {
+    if aggs.iter().any(|a| a.original_expr == *expr) {
+        return;
+    }
     match expr {
         ast::Expr::FunctionCall { name, args, .. } => {
             let args_count = if let Some(args) = &args {
@@ -433,6 +436,9 @@ pub fn prepare_select_plan<'a>(schema: &Schema, select: ast::Select) -> Result<P
                     };
 
                     bind_column_references(&mut expr, &plan.referenced_tables)?;
+                    if let Some(aggs) = &mut plan.aggregates {
+                        resolve_aggregates(&expr, aggs);
+                    }
 
                     key.push((
                         expr,
diff --git a/testing/orderby.test b/testing/orderby.test
index a973ed114..787483570 100755
--- a/testing/orderby.test
+++ b/testing/orderby.test
@@ -115,4 +115,17 @@ Dennis|Ward|1
 Whitney|Walker|1
 Robert|Villanueva|1
 Cynthia|Thomas|1
-Brandon|Tate|1}
\ No newline at end of file
+Brandon|Tate|1}
+
+do_execsql_test order-by-case-insensitive-aggregate {
+  select u.first_name, sum(u.age) from users u group by u.first_name order by SUM(u.aGe) desc limit 10;
+} {Michael|11204
+David|8758
+Robert|8109
+Jennifer|7700
+John|7299
+Christopher|6397
+James|5921
+Joseph|5711
+Brian|5059
+William|5047}
\ No newline at end of file