Changeset: 279b78aa58aa for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/279b78aa58aa
Modified Files:
        sql/server/rel_select.c
        sql/test/BugTracker-2023/Tests/rel_order_by-assertion-7418.test
Branch: Dec2023
Log Message:

small fix for issue 7418, ie in window function handling don't pass that we are 
already in a order by.


diffs (27 lines):

diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -5105,7 +5105,7 @@ rel_rankop(sql_query *query, sql_rel **r
 
        /* Order By */
        if (order_by_clause) {
-               obe = rel_order_by(query, &p, order_by_clause, 0, nf | 
sql_window);
+               obe = rel_order_by(query, &p, order_by_clause, 0, sql_window);
                if (!obe)
                        return NULL;
        }
diff --git a/sql/test/BugTracker-2023/Tests/rel_order_by-assertion-7418.test 
b/sql/test/BugTracker-2023/Tests/rel_order_by-assertion-7418.test
--- a/sql/test/BugTracker-2023/Tests/rel_order_by-assertion-7418.test
+++ b/sql/test/BugTracker-2023/Tests/rel_order_by-assertion-7418.test
@@ -14,8 +14,10 @@ statement error 42000!MAX: aggregate fun
 SELECT 0 IS NOT NULL FROM t7418 ORDER BY AVG ( max ( 331 ) ) NULLS LAST
 
 -- next causes: sql/server/rel_select.c:4766: rel_order_by: Assertion 
`is_project(rel->op)' failed.
-statement error 42000!MAX: aggregate functions cannot be nested
+query I
 SELECT 0 IS NOT NULL FROM t7418 ORDER BY AVG ( max ( 331 ) ) OVER ( ORDER BY 
634 NULLS FIRST ) NULLS LAST
+----
+1
 
 query I
 SELECT * FROM t7418 ORDER BY v1
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

Reply via email to