python-sql 1.5.0__tar.gz → 1.5.1__tar.gz

{python_sql-1.5.0 → python_sql-1.5.1}/.hgtags

@@ -18,3 +18,4 @@ e71bbae3398cb6a0e72f97a0cada9fcdee2bddea 1.4.1
 fcb64787b51db2068061eb4aa13825abc1134916 1.4.2
 111e3e86865360f83a65c04fa48c55f3d2957ee3 1.4.3
 6f9066b83fe3a8c4699a8555ad1bc406f18974ff 1.5.0
+79a69b0bbbd35a8d95e1b754ed3feb03df23fb70 1.5.1

{python_sql-1.5.0 → python_sql-1.5.1}/CHANGELOG

@@ -1,3 +1,7 @@
+Version 1.5.1 - 2024-05-28
+* Use parameter for start and end of WINDOW FRAME
+* Use parameter for limit and offset
+
 Version 1.5.0 - 2024-05-13
 * Skip alias on INSERT without ON CONFLICT or RETURNING
 * Add MERGE

{python_sql-1.5.0 → python_sql-1.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-sql
-Version: 1.5.0
+Version: 1.5.1
 Summary: Library to write SQL queries
 Home-page: https://pypi.org/project/python-sql/
 Download-URL: https://downloads.tryton.org/python-sql/

{python_sql-1.5.0 → python_sql-1.5.1}/python_sql.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-sql
-Version: 1.5.0
+Version: 1.5.1
 Summary: Library to write SQL queries
 Home-page: https://pypi.org/project/python-sql/
 Download-URL: https://downloads.tryton.org/python-sql/

{python_sql-1.5.0 → python_sql-1.5.1}/sql/__init__.py

@@ -7,7 +7,7 @@ from collections import defaultdict
 from itertools import chain
 from threading import current_thread, local
 
-__version__ = '1.5.0'
+__version__ = '1.5.1'
 __all__ = [
     'Flavor', 'Table', 'Values', 'Literal', 'Column', 'Grouping', 'Conflict',
     'Matched', 'MatchedUpdate', 'MatchedDelete',
@@ -380,13 +380,14 @@ class SelectQuery(WithQuery):
 
     @property
     def _limit_offset_str(self):
+        param = Flavor.get().param
         if Flavor.get().limitstyle == 'limit':
             offset = ''
             if self.offset:
-                offset = ' OFFSET %s' % self.offset
+                offset = ' OFFSET %s' % param
             limit = ''
             if self.limit is not None:
-                limit = ' LIMIT %s' % self.limit
+                limit = ' LIMIT %s' % param
             elif self.offset:
                 max_limit = Flavor.get().max_limit
                 if max_limit:
@@ -395,12 +396,27 @@ class SelectQuery(WithQuery):
         else:
             offset = ''
             if self.offset:
-                offset = ' OFFSET (%s) ROWS' % self.offset
+                offset = ' OFFSET (%s) ROWS' % param
             fetch = ''
             if self.limit is not None:
-                fetch = ' FETCH FIRST (%s) ROWS ONLY' % self.limit
+                fetch = ' FETCH FIRST (%s) ROWS ONLY' % param
             return offset + fetch
 
+    @property
+    def _limit_offset_params(self):
+        p = []
+        if Flavor.get().limitstyle == 'limit':
+            if self.limit is not None:
+                p.append(self.limit)
+            if self.offset:
+                p.append(self.offset)
+        else:
+            if self.offset:
+                p.append(self.offset)
+            if self.limit is not None:
+                p.append(self.limit)
+        return tuple(p)
+
     def as_(self, output_name):
         return As(self, output_name)
 
@@ -663,6 +679,7 @@ class Select(FromItem, SelectQuery):
                 p.extend(self.having.params)
             for window in self.windows:
                 p.extend(window.params)
+            p.extend(self._limit_offset_params)
         return tuple(p)
 
 
@@ -1992,6 +2009,7 @@ class Window(object):
         return AliasManager.contains(self)
 
     def __str__(self):
+        param = Flavor.get().param
         partition = ''
         if self.partition:
             partition = 'PARTITION BY ' + ', '.join(map(str, self.partition))
@@ -2005,9 +2023,9 @@ class Window(object):
             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:
@@ -2028,6 +2046,11 @@ class Window(object):
         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)
 
 

{python_sql-1.5.0 → python_sql-1.5.1}/sql/tests/test_select.py

@@ -253,13 +253,13 @@ class TestSelect(unittest.TestCase):
             Flavor.set(Flavor(limitstyle='limit'))
             query = self.table.select(limit=50, offset=10)
             self.assertEqual(str(query),
-                'SELECT * FROM "t" AS "a" LIMIT 50 OFFSET 10')
-            self.assertEqual(tuple(query.params), ())
+                'SELECT * FROM "t" AS "a" LIMIT %s OFFSET %s')
+            self.assertEqual(tuple(query.params), (50, 10))
 
             query.limit = None
             self.assertEqual(str(query),
-                'SELECT * FROM "t" AS "a" OFFSET 10')
-            self.assertEqual(tuple(query.params), ())
+                'SELECT * FROM "t" AS "a" OFFSET %s')
+            self.assertEqual(tuple(query.params), (10,))
 
             query.offset = 0
             self.assertEqual(str(query),
@@ -280,8 +280,8 @@ class TestSelect(unittest.TestCase):
 
             query.offset = 10
             self.assertEqual(str(query),
-                'SELECT * FROM "t" AS "a" LIMIT -1 OFFSET 10')
-            self.assertEqual(tuple(query.params), ())
+                'SELECT * FROM "t" AS "a" LIMIT -1 OFFSET %s')
+            self.assertEqual(tuple(query.params), (10,))
         finally:
             Flavor.set(Flavor())
 
@@ -291,13 +291,13 @@ class TestSelect(unittest.TestCase):
             query = self.table.select(limit=50, offset=10)
             self.assertEqual(str(query),
                 'SELECT * FROM "t" AS "a" '
-                'OFFSET (10) ROWS FETCH FIRST (50) ROWS ONLY')
-            self.assertEqual(tuple(query.params), ())
+                'OFFSET (%s) ROWS FETCH FIRST (%s) ROWS ONLY')
+            self.assertEqual(tuple(query.params), (10, 50))
 
             query.limit = None
             self.assertEqual(str(query),
-                'SELECT * FROM "t" AS "a" OFFSET (10) ROWS')
-            self.assertEqual(tuple(query.params), ())
+                'SELECT * FROM "t" AS "a" OFFSET (%s) ROWS')
+            self.assertEqual(tuple(query.params), (10,))
 
             query.offset = 0
             self.assertEqual(str(query),

{python_sql-1.5.0 → python_sql-1.5.1}/sql/tests/test_window.py

@@ -33,22 +33,22 @@ class TestWindow(unittest.TestCase):
         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')