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

{python_sql-1.6.0 → 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", "3.13"]
+      - 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.6.0 → python_sql-1.7.0}/.hgtags

@@ -21,3 +21,4 @@ fcb64787b51db2068061eb4aa13825abc1134916 1.4.2
 79a69b0bbbd35a8d95e1b754ed3feb03df23fb70 1.5.1
 41b0aaa68f5e5bab3889fa1ef57ef44c6c21cacf 1.5.2
 475502ba46eba3b7e141e8fbceaf495b545bcddb 1.6.0
+231ce10b975e41027c6121f9bb9033d786553b90 1.7.0

{python_sql-1.6.0 → python_sql-1.7.0}/CHANGELOG

@@ -1,3 +1,7 @@
+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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-sql
-Version: 1.6.0
+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/
@@ -25,6 +25,7 @@ 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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-sql
-Version: 1.6.0
+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/
@@ -25,6 +25,7 @@ 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

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

@@ -49,6 +49,7 @@ setup(name='python-sql',
         '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.6.0 → 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.6.0'
+__version__ = '1.7.0'
 __all__ = [
     'Flavor', 'Table', 'Values', 'Literal', 'Column', 'Grouping', 'Conflict',
     'Matched', 'MatchedUpdate', 'MatchedDelete',

{python_sql-1.6.0 → 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.6.0 → 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.6.0 → 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, py313, pypy3
+envlist = py35, py36, py37, py38, py39, py310, py311, py312, py313, py314, pypy3
 
 [testenv]
 usedevelop = true