Fix position of order_by parameters in Select query

cedk · cedk · commit cdbcb2bf4912 · 2025-05-02T09:15:41.000+02:00
The order_by must come after the parameters of having and windows.

Closes #94
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,4 @@
+* Fix position of order_by parameters in Select query
 * Add support for weak reference on SQL objects
 * Add support for Python 3.13
 
diff --git a/sql/__init__.py b/sql/__init__.py
@@ -692,13 +692,13 @@ def params(self):
             if self.group_by:
                 for expression in self.group_by:
                     p.extend(expression.params)
-            if self.order_by:
-                for expression in self.order_by:
-                    p.extend(expression.params)
             if self.having:
                 p.extend(self.having.params)
             for window in self.windows:
                 p.extend(window.params)
+            if self.order_by:
+                for expression in self.order_by:
+                    p.extend(expression.params)
             p.extend(self._limit_offset_params)
         return tuple(p)
 
diff --git a/sql/tests/test_select.py b/sql/tests/test_select.py
@@ -531,14 +531,24 @@ def test_select_invalid_window(self):
     def test_order_params(self):
         with_ = With(query=self.table.select(self.table.c,
                 where=(self.table.c > 1)))
-        w = Window([Literal(8)])
+        w = Window([Literal(7)])
         query = Select([Literal(2), Min(self.table.c, window=w)],
             from_=self.table.select(where=self.table.c > 3),
             with_=with_,
             where=self.table.c > 4,
             group_by=[Literal(5)],
-            order_by=[Literal(6)],
-            having=Literal(7))
+            having=Literal(6),
+            order_by=[Literal(8)])
+        self.assertEqual(
+            str(query),
+            'WITH "c" AS (SELECT "a"."c" FROM "t" AS "a" WHERE ("a"."c" > %s))'
+            ' SELECT %s, MIN("a"."c") OVER "b" '
+            'FROM SELECT * FROM "t" AS "a" WHERE ("a"."c" > %s) '
+            'WHERE ("a"."c" > %s) '
+            'GROUP BY %s '
+            'HAVING %s '
+            'WINDOW "b" AS (PARTITION BY %s) '
+            'ORDER BY %s')
         self.assertEqual(tuple(query.params), (1, 2, 3, 4, 5, 6, 7, 8))
 
     def test_no_as(self):

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+* Fix position of order_by parameters in Select query`
`1`	`2`	`* Add support for weak reference on SQL objects`
`2`	`3`	`* Add support for Python 3.13`
`3`	`4`