Use parameter for start and end of WINDOW FRAME

cedk · cedk · commit 02ef4c50e226 · 2024-05-27T18:58:04.000+02:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,4 @@
+* Use parameter for start and end of WINDOW FRAME
 * Use parameter for limit and offset
 
 Version 1.5.0 - 2024-05-13
diff --git a/sql/__init__.py b/sql/__init__.py
@@ -2009,6 +2009,7 @@ def has_alias(self):
         return AliasManager.contains(self)
 
     def __str__(self):
+        param = Flavor.get().param
         partition = ''
         if self.partition:
             partition = 'PARTITION BY ' + ', '.join(map(str, self.partition))
@@ -2022,9 +2023,9 @@ def format(frame, direction):
             elif not frame:
                 return 'CURRENT ROW'
             elif frame < 0:
-                return '%s PRECEDING' % -frame
+                return '%s PRECEDING' % param
             elif frame > 0:
-                return '%s FOLLOWING' % frame
+                return '%s FOLLOWING' % param
 
         frame = ''
         if self.frame:
@@ -2045,6 +2046,11 @@ def params(self):
         if self.order_by:
             for expression in self.order_by:
                 p.extend(expression.params)
+        if self.frame:
+            if self.start:
+                p.append(abs(self.start))
+            if self.end:
+                p.append(abs(self.end))
         return tuple(p)
 
 
diff --git a/sql/tests/test_window.py b/sql/tests/test_window.py
@@ -33,22 +33,22 @@ def test_window_range(self):
         window.start = -1
         self.assertEqual(str(window),
             'PARTITION BY "c" RANGE '
-            'BETWEEN 1 PRECEDING AND CURRENT ROW')
-        self.assertEqual(window.params, ())
+            'BETWEEN %s PRECEDING AND CURRENT ROW')
+        self.assertEqual(window.params, (1,))
 
         window.start = 0
         window.end = 1
         self.assertEqual(str(window),
             'PARTITION BY "c" RANGE '
-            'BETWEEN CURRENT ROW AND 1 FOLLOWING')
-        self.assertEqual(window.params, ())
+            'BETWEEN CURRENT ROW AND %s FOLLOWING')
+        self.assertEqual(window.params, (1,))
 
         window.start = 1
         window.end = None
         self.assertEqual(str(window),
             'PARTITION BY "c" RANGE '
-            'BETWEEN 1 FOLLOWING AND UNBOUNDED FOLLOWING')
-        self.assertEqual(window.params, ())
+            'BETWEEN %s FOLLOWING AND UNBOUNDED FOLLOWING')
+        self.assertEqual(window.params, (1,))
 
     def test_window_exclude(self):
         t = Table('t')

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+* Use parameter for start and end of WINDOW FRAME`
`1`	`2`	`* Use parameter for limit and offset`
`2`	`3`
`3`	`4`	`Version 1.5.0 - 2024-05-13`