python-sql 1.6.0__py3-none-any.whl → 1.7.0__py3-none-any.whl

{python_sql-1.6.0.dist-info → python_sql-1.7.0.dist-info}/METADATA

@@ -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.dist-info → python_sql-1.7.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
-sql/__init__.py,sha256=-nJkGjLVQGCXqmhds4JZSFJv0hmWO_v9X3G3JaNbSEI,64423
-sql/aggregate.py,sha256=RXBhXHKRARhbTjMxuf6PR29vz5lHzEm_qJHzvfwHw2Q,5834
+sql/__init__.py,sha256=lZFpmxm8nGym-rx6OTL-jxlCvLIxsCGtFeSNYqE2KEo,64423
+sql/aggregate.py,sha256=Spg5T4y8SSUN5Tyc7GUVB6I_69AhrVHVCkOgzFX482A,6008
 sql/conditionals.py,sha256=xJY6ffEBeES6CiGKErXSa2dK2FXaEaR_QQl_CKILP30,2541
 sql/functions.py,sha256=IrX7ft6Psvr0XgoACE_iq6AupdeFJbo_62JoJCXnycs,12550
 sql/operators.py,sha256=Yw8cQCKT9p-OkwkCTjLg4Une2Daur14CbpsRo4SX-v8,10923
 sql/tests/__init__.py,sha256=QA18gftL_tykRkbGriAobA3THDVu34v8Pdn-a2qJywY,679
-sql/tests/test_aggregate.py,sha256=RZDc_6pQg7pBmrDEXY15N3ntojVhjR81qkzyp3P7PD8,3376
+sql/tests/test_aggregate.py,sha256=hvt6z9mdBD0yGvGfviGrlWlD9mqSxwRyQeNbAJ0ciMY,3371
 sql/tests/test_alias.py,sha256=wtBwMkA8HADz3Tq6kz-MJXBG75hL0AbO2Z3LE7L2YTY,2408
 sql/tests/test_as.py,sha256=OfXDu0CnJ2paRKR29dMdx7q_Q9TFY60MWlvib6MR5LY,926
 sql/tests/test_cast.py,sha256=ejrqHQZwA3967UhszYR3caZYvH3waPcF6li4rnmxGi4,653
@@ -35,7 +35,7 @@ sql/tests/test_update.py,sha256=SCUsUCfMqtOS0m_87Ne24wgdPHgEs3jynbDEQP33oeg,3784
 sql/tests/test_values.py,sha256=qKvaFSDEQmVWajWhMZgqD2-rQcWJeW_nsevVMsV3jD8,1053
 sql/tests/test_window.py,sha256=EpqjZX2cyQ-m7UWMubrB5MOtL_5uF8jSnNhODfE74xc,3183
 sql/tests/test_with.py,sha256=SSLN1b0L8bLr5MwvCPOynP0HdfkUNPCNv7BWSJ4DalY,2371
-python_sql-1.6.0.dist-info/METADATA,sha256=yDf7Ch11yLkhncjfGgHtocDjQSrtDLvi_wiAlEOMvQo,8776
-python_sql-1.6.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-python_sql-1.6.0.dist-info/top_level.txt,sha256=hwJHmWfbRP5a_XNfqgHwi2zrjAAzAJk24QZoTocslow,4
-python_sql-1.6.0.dist-info/RECORD,,
+python_sql-1.7.0.dist-info/METADATA,sha256=9VRO5_BMROKM_6fuEnUW-NCdG2i-jPqCJlj2VHhPe44,8827
+python_sql-1.7.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+python_sql-1.7.0.dist-info/top_level.txt,sha256=hwJHmWfbRP5a_XNfqgHwi2zrjAAzAJk24QZoTocslow,4
+python_sql-1.7.0.dist-info/RECORD,,

{python_sql-1.6.0.dist-info → python_sql-1.7.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

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',

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
 

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)