python-sql 1.5.2__tar.gz → 1.7.0__tar.gz

{python_sql-1.5.2 → python_sql-1.7.0}/.gitlab-ci.yml

@@ -57,7 +57,7 @@ test-tox-python:
     - tox -e "py${PYTHON_VERSION/./}" -- -v --output-file junit.xml
   parallel:
     matrix:
-      - PYTHON_VERSION: ["3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+      - PYTHON_VERSION: ["3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
 
 test-tox-pypy:
   extends: .test-tox

{python_sql-1.5.2 → python_sql-1.7.0}/.hgtags

@@ -20,3 +20,5 @@ fcb64787b51db2068061eb4aa13825abc1134916 1.4.2
 6f9066b83fe3a8c4699a8555ad1bc406f18974ff 1.5.0
 79a69b0bbbd35a8d95e1b754ed3feb03df23fb70 1.5.1
 41b0aaa68f5e5bab3889fa1ef57ef44c6c21cacf 1.5.2
+475502ba46eba3b7e141e8fbceaf495b545bcddb 1.6.0
+231ce10b975e41027c6121f9bb9033d786553b90 1.7.0

{python_sql-1.5.2 → python_sql-1.7.0}/CHANGELOG

@@ -1,3 +1,12 @@
+Version 1.7.0 - 2025-11-24
+* Add support for Python 3.14
+* Do not use parameters for COUNT(*)
+
+Version 1.6.0 - 2025-05-02
+* Fix position of order_by parameters in Select query
+* Add support for weak reference on SQL objects
+* Add support for Python 3.13
+
 Version 1.5.2 - 2024-09-30
 * Use parameter for unary operator
 * Support default values when inserting not matched merge

{python_sql-1.5.2 → python_sql-1.7.0}/COPYRIGHT

@@ -1,6 +1,6 @@
-Copyright (c) 2011-2024, Cédric Krier
-Copyright (c) 2013-2023, Nicolas Évrard
-Copyright (c) 2011-2024, B2CK
+Copyright (c) 2011-2025, Cédric Krier
+Copyright (c) 2013-2025, Nicolas Évrard
+Copyright (c) 2011-2025, B2CK
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

{python_sql-1.5.2 → python_sql-1.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: python-sql
-Version: 1.5.2
+Version: 1.7.0
 Summary: Library to write SQL queries
 Home-page: https://pypi.org/project/python-sql/
 Download-URL: https://downloads.tryton.org/python-sql/
@@ -24,9 +24,22 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Database
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.5
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: download-url
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: project-url
+Dynamic: requires-python
+Dynamic: summary
 
 python-sql
 ==========
@@ -136,23 +149,23 @@ Select on other schema::
 Insert query with default values::
 
     >>> tuple(user.insert())
-    ('INSERT INTO "user" AS "a" DEFAULT VALUES', ())
+    ('INSERT INTO "user" DEFAULT VALUES', ())
 
 Insert query with values::
 
     >>> tuple(user.insert(columns=[user.name, user.login],
     ...         values=[['Foo', 'foo']]))
-    ('INSERT INTO "user" AS "a" ("name", "login") VALUES (%s, %s)', ('Foo', 'foo'))
+    ('INSERT INTO "user" ("name", "login") VALUES (%s, %s)', ('Foo', 'foo'))
     >>> tuple(user.insert(columns=[user.name, user.login],
     ...         values=[['Foo', 'foo'], ['Bar', 'bar']]))
-    ('INSERT INTO "user" AS "a" ("name", "login") VALUES (%s, %s), (%s, %s)', ('Foo', 'foo', 'Bar', 'bar'))
+    ('INSERT INTO "user" ("name", "login") VALUES (%s, %s), (%s, %s)', ('Foo', 'foo', 'Bar', 'bar'))
 
 Insert query with query::
 
     >>> passwd = Table('passwd')
     >>> select = passwd.select(passwd.login, passwd.passwd)
     >>> tuple(user.insert(values=select))
-    ('INSERT INTO "user" AS "b" SELECT "a"."login", "a"."passwd" FROM "passwd" AS "a"', ())
+    ('INSERT INTO "user" SELECT "a"."login", "a"."passwd" FROM "passwd" AS "a"', ())
 
 Update query with values::
 
@@ -196,23 +209,23 @@ Flavors::
     >>> select.offset = 10
     >>> Flavor.set(Flavor())
     >>> tuple(select)
-    ('SELECT * FROM "user" AS "a" OFFSET 10', ())
+    ('SELECT * FROM "user" AS "a" OFFSET %s', (10,))
     >>> Flavor.set(Flavor(max_limit=18446744073709551615))
     >>> tuple(select)
-    ('SELECT * FROM "user" AS "a" LIMIT 18446744073709551615 OFFSET 10', ())
+    ('SELECT * FROM "user" AS "a" LIMIT 18446744073709551615 OFFSET %s', (10,))
     >>> Flavor.set(Flavor(max_limit=-1))
     >>> tuple(select)
-    ('SELECT * FROM "user" AS "a" LIMIT -1 OFFSET 10', ())
+    ('SELECT * FROM "user" AS "a" LIMIT -1 OFFSET %s', (10,))
 
 Limit style::
 
     >>> select = user.select(limit=10, offset=20)
     >>> Flavor.set(Flavor(limitstyle='limit'))
     >>> tuple(select)
-    ('SELECT * FROM "user" AS "a" LIMIT 10 OFFSET 20', ())
+    ('SELECT * FROM "user" AS "a" LIMIT %s OFFSET %s', (10, 20))
     >>> Flavor.set(Flavor(limitstyle='fetch'))
     >>> tuple(select)
-    ('SELECT * FROM "user" AS "a" OFFSET (20) ROWS FETCH FIRST (10) ROWS ONLY', ())
+    ('SELECT * FROM "user" AS "a" OFFSET (%s) ROWS FETCH FIRST (%s) ROWS ONLY', (20, 10))
     >>> Flavor.set(Flavor(limitstyle='rownum'))
     >>> tuple(select)
     ('SELECT "a".* FROM (SELECT "b".*, ROWNUM AS "rnum" FROM (SELECT * FROM "user" AS "c") AS "b" WHERE (ROWNUM <= %s)) AS "a" WHERE ("rnum" > %s)', (30, 20))

{python_sql-1.5.2 → python_sql-1.7.0}/README.rst

@@ -106,23 +106,23 @@ Select on other schema::
 Insert query with default values::
 
     >>> tuple(user.insert())
-    ('INSERT INTO "user" AS "a" DEFAULT VALUES', ())
+    ('INSERT INTO "user" DEFAULT VALUES', ())
 
 Insert query with values::
 
     >>> tuple(user.insert(columns=[user.name, user.login],
     ...         values=[['Foo', 'foo']]))
-    ('INSERT INTO "user" AS "a" ("name", "login") VALUES (%s, %s)', ('Foo', 'foo'))
+    ('INSERT INTO "user" ("name", "login") VALUES (%s, %s)', ('Foo', 'foo'))
     >>> tuple(user.insert(columns=[user.name, user.login],
     ...         values=[['Foo', 'foo'], ['Bar', 'bar']]))
-    ('INSERT INTO "user" AS "a" ("name", "login") VALUES (%s, %s), (%s, %s)', ('Foo', 'foo', 'Bar', 'bar'))
+    ('INSERT INTO "user" ("name", "login") VALUES (%s, %s), (%s, %s)', ('Foo', 'foo', 'Bar', 'bar'))
 
 Insert query with query::
 
     >>> passwd = Table('passwd')
     >>> select = passwd.select(passwd.login, passwd.passwd)
     >>> tuple(user.insert(values=select))
-    ('INSERT INTO "user" AS "b" SELECT "a"."login", "a"."passwd" FROM "passwd" AS "a"', ())
+    ('INSERT INTO "user" SELECT "a"."login", "a"."passwd" FROM "passwd" AS "a"', ())
 
 Update query with values::
 
@@ -166,23 +166,23 @@ Flavors::
     >>> select.offset = 10
     >>> Flavor.set(Flavor())
     >>> tuple(select)
-    ('SELECT * FROM "user" AS "a" OFFSET 10', ())
+    ('SELECT * FROM "user" AS "a" OFFSET %s', (10,))
     >>> Flavor.set(Flavor(max_limit=18446744073709551615))
     >>> tuple(select)
-    ('SELECT * FROM "user" AS "a" LIMIT 18446744073709551615 OFFSET 10', ())
+    ('SELECT * FROM "user" AS "a" LIMIT 18446744073709551615 OFFSET %s', (10,))
     >>> Flavor.set(Flavor(max_limit=-1))
     >>> tuple(select)
-    ('SELECT * FROM "user" AS "a" LIMIT -1 OFFSET 10', ())
+    ('SELECT * FROM "user" AS "a" LIMIT -1 OFFSET %s', (10,))
 
 Limit style::
 
     >>> select = user.select(limit=10, offset=20)
     >>> Flavor.set(Flavor(limitstyle='limit'))
     >>> tuple(select)
-    ('SELECT * FROM "user" AS "a" LIMIT 10 OFFSET 20', ())
+    ('SELECT * FROM "user" AS "a" LIMIT %s OFFSET %s', (10, 20))
     >>> Flavor.set(Flavor(limitstyle='fetch'))
     >>> tuple(select)
-    ('SELECT * FROM "user" AS "a" OFFSET (20) ROWS FETCH FIRST (10) ROWS ONLY', ())
+    ('SELECT * FROM "user" AS "a" OFFSET (%s) ROWS FETCH FIRST (%s) ROWS ONLY', (20, 10))
     >>> Flavor.set(Flavor(limitstyle='rownum'))
     >>> tuple(select)
     ('SELECT "a".* FROM (SELECT "b".*, ROWNUM AS "rnum" FROM (SELECT * FROM "user" AS "c") AS "b" WHERE (ROWNUM <= %s)) AS "a" WHERE ("rnum" > %s)', (30, 20))

{python_sql-1.5.2 → python_sql-1.7.0}/python_sql.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: python-sql
-Version: 1.5.2
+Version: 1.7.0
 Summary: Library to write SQL queries
 Home-page: https://pypi.org/project/python-sql/
 Download-URL: https://downloads.tryton.org/python-sql/
@@ -24,9 +24,22 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Database
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.5
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: download-url
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: project-url
+Dynamic: requires-python
+Dynamic: summary
 
 python-sql
 ==========
@@ -136,23 +149,23 @@ Select on other schema::
 Insert query with default values::
 
     >>> tuple(user.insert())
-    ('INSERT INTO "user" AS "a" DEFAULT VALUES', ())
+    ('INSERT INTO "user" DEFAULT VALUES', ())
 
 Insert query with values::
 
     >>> tuple(user.insert(columns=[user.name, user.login],
     ...         values=[['Foo', 'foo']]))
-    ('INSERT INTO "user" AS "a" ("name", "login") VALUES (%s, %s)', ('Foo', 'foo'))
+    ('INSERT INTO "user" ("name", "login") VALUES (%s, %s)', ('Foo', 'foo'))
     >>> tuple(user.insert(columns=[user.name, user.login],
     ...         values=[['Foo', 'foo'], ['Bar', 'bar']]))
-    ('INSERT INTO "user" AS "a" ("name", "login") VALUES (%s, %s), (%s, %s)', ('Foo', 'foo', 'Bar', 'bar'))
+    ('INSERT INTO "user" ("name", "login") VALUES (%s, %s), (%s, %s)', ('Foo', 'foo', 'Bar', 'bar'))
 
 Insert query with query::
 
     >>> passwd = Table('passwd')
     >>> select = passwd.select(passwd.login, passwd.passwd)
     >>> tuple(user.insert(values=select))
-    ('INSERT INTO "user" AS "b" SELECT "a"."login", "a"."passwd" FROM "passwd" AS "a"', ())
+    ('INSERT INTO "user" SELECT "a"."login", "a"."passwd" FROM "passwd" AS "a"', ())
 
 Update query with values::
 
@@ -196,23 +209,23 @@ Flavors::
     >>> select.offset = 10
     >>> Flavor.set(Flavor())
     >>> tuple(select)
-    ('SELECT * FROM "user" AS "a" OFFSET 10', ())
+    ('SELECT * FROM "user" AS "a" OFFSET %s', (10,))
     >>> Flavor.set(Flavor(max_limit=18446744073709551615))
     >>> tuple(select)
-    ('SELECT * FROM "user" AS "a" LIMIT 18446744073709551615 OFFSET 10', ())
+    ('SELECT * FROM "user" AS "a" LIMIT 18446744073709551615 OFFSET %s', (10,))
     >>> Flavor.set(Flavor(max_limit=-1))
     >>> tuple(select)
-    ('SELECT * FROM "user" AS "a" LIMIT -1 OFFSET 10', ())
+    ('SELECT * FROM "user" AS "a" LIMIT -1 OFFSET %s', (10,))
 
 Limit style::
 
     >>> select = user.select(limit=10, offset=20)
     >>> Flavor.set(Flavor(limitstyle='limit'))
     >>> tuple(select)
-    ('SELECT * FROM "user" AS "a" LIMIT 10 OFFSET 20', ())
+    ('SELECT * FROM "user" AS "a" LIMIT %s OFFSET %s', (10, 20))
     >>> Flavor.set(Flavor(limitstyle='fetch'))
     >>> tuple(select)
-    ('SELECT * FROM "user" AS "a" OFFSET (20) ROWS FETCH FIRST (10) ROWS ONLY', ())
+    ('SELECT * FROM "user" AS "a" OFFSET (%s) ROWS FETCH FIRST (%s) ROWS ONLY', (20, 10))
     >>> Flavor.set(Flavor(limitstyle='rownum'))
     >>> tuple(select)
     ('SELECT "a".* FROM (SELECT "b".*, ROWNUM AS "rnum" FROM (SELECT * FROM "user" AS "c") AS "b" WHERE (ROWNUM <= %s)) AS "a" WHERE ("rnum" > %s)', (30, 20))

{python_sql-1.5.2 → python_sql-1.7.0}/setup.py

@@ -48,6 +48,8 @@ setup(name='python-sql',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
+        'Programming Language :: Python :: 3.14',
         'Topic :: Database',
         'Topic :: Software Development :: Libraries :: Python Modules',
         ],

{python_sql-1.5.2 → python_sql-1.7.0}/sql/__init__.py

@@ -7,7 +7,7 @@ from collections import defaultdict
 from itertools import chain
 from threading import current_thread, local
 
-__version__ = '1.5.2'
+__version__ = '1.7.0'
 __all__ = [
     'Flavor', 'Table', 'Values', 'Literal', 'Column', 'Grouping', 'Conflict',
     'Matched', 'MatchedUpdate', 'MatchedDelete',
@@ -182,7 +182,7 @@ def format2numeric(query, params):
 
 
 class Query(object):
-    __slots__ = ()
+    __slots__ = ('__weakref__',)
 
     @property
     def params(self):
@@ -243,7 +243,7 @@ class WithQuery(Query):
 
 
 class FromItem(object):
-    __slots__ = ()
+    __slots__ = ('__weakref__',)
 
     @property
     def alias(self):
@@ -692,13 +692,13 @@ class Select(FromItem, SelectQuery):
             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)
 
@@ -1615,7 +1615,7 @@ class Values(list, Query, FromItem):
 
 
 class Expression(object):
-    __slots__ = ()
+    __slots__ = ('__weakref__',)
 
     def __str__(self):
         raise NotImplementedError
@@ -1986,7 +1986,8 @@ class Cube(Rollup):
 
 class Window(object):
     __slots__ = (
-        '_partition', '_order_by', '_frame', '_start', '_end', '_exclude')
+        '_partition', '_order_by', '_frame', '_start', '_end', '_exclude',
+        '__weakref__')
 
     def __init__(self, partition, order_by=None,
             frame=None, start=None, end=0, exclude=None):

{python_sql-1.5.2 → python_sql-1.7.0}/sql/aggregate.py

@@ -4,7 +4,6 @@ from sql import Expression, Flavor, Literal, Window
 
 __all__ = ['Avg', 'BitAnd', 'BitOr', 'BoolAnd', 'BoolOr', 'Count', 'Every',
     'Max', 'Min', 'Stddev', 'Sum', 'Variance']
-_sentinel = object()
 
 
 class Aggregate(Expression):
@@ -169,20 +168,31 @@ class BoolOr(Aggregate):
     _sql = 'BOOL_OR'
 
 
+class _Star(Expression):
+    __slots__ = ()
+
+    def __str__(self):
+        return '*'
+
+    @property
+    def params(self):
+        return ()
+
+
 class Count(Aggregate):
     __slots__ = ()
     _sql = 'COUNT'
 
-    def __init__(self, expression=_sentinel, **kwargs):
-        if expression is _sentinel:
-            expression = Literal('*')
+    def __init__(self, expression=_Star(), **kwargs):
         super().__init__(expression, **kwargs)
 
     @property
     def _case_expression(self):
         expression = super(Count, self)._case_expression
-        if (isinstance(self.expression, Literal)
-                and expression.value == '*'):
+        if (isinstance(self.expression, _Star)
+                # Keep testing Literal('*') for backward compatibility
+                or (isinstance(self.expression, Literal)
+                and expression.value == '*')):
             expression = Literal(1)
         return expression
 

{python_sql-1.5.2 → python_sql-1.7.0}/sql/tests/__init__.py

@@ -6,7 +6,7 @@ import os
 import sql
 
 here = os.path.dirname(__file__)
-readme = os.path.normpath(os.path.join(here, '..', '..', 'README'))
+readme = os.path.normpath(os.path.join(here, '..', '..', 'README.rst'))
 
 
 def load_tests(loader, tests, pattern):

{python_sql-1.5.2 → python_sql-1.7.0}/sql/tests/test_aggregate.py

@@ -42,8 +42,8 @@ class TestAggregate(unittest.TestCase):
 
     def test_count_without_expression(self):
         count = Count()
-        self.assertEqual(str(count), 'COUNT(%s)')
-        self.assertEqual(count.params, ('*',))
+        self.assertEqual(str(count), 'COUNT(*)')
+        self.assertEqual(count.params, ())
 
     def test_order_by_one_column(self):
         avg = Avg(self.table.a, order_by=self.table.b)

{python_sql-1.5.2 → python_sql-1.7.0}/sql/tests/test_select.py

@@ -531,14 +531,24 @@ class TestSelect(unittest.TestCase):
     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):

{python_sql-1.5.2 → python_sql-1.7.0}/tox.ini

@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py35, py36, py37, py38, py39, py310, py311, py312, pypy3
+envlist = py35, py36, py37, py38, py39, py310, py311, py312, py313, py314, pypy3
 
 [testenv]
 usedevelop = true