Add support for array operators

cedk · cedk · commit ce59f80fda1b · 2026-01-24T09:06:14.000+01:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,4 @@
+* Add support for array operators
 * Remove the parentheses around the unary and binary operators
 * Use the ordinal number as aliases for GROUP BY
 * Check the coherence of the aliases of GROUP BY and ORDER BY expressions
diff --git a/sql/operators.py b/sql/operators.py
@@ -49,7 +49,8 @@ def _format(self, operand, param=None):
         if param is None:
             param = Flavor.get().param
         if (isinstance(operand, Expression)
-                and not isinstance(operand, Operator)):
+                and (not isinstance(operand, Operator)
+                    or isinstance(operand, UnaryOperator))):
             return str(operand)
         elif isinstance(operand, (Expression, Select, CombiningQuery)):
             return '(%s)' % operand
@@ -458,15 +459,32 @@ class Exists(UnaryOperator):
     _operator = 'EXISTS'
 
 
-class Any(UnaryOperator):
+class _ArrayOperator(UnaryOperator):
+    __slots__ = ()
+
+    @property
+    def params(self):
+        if isinstance(self.operand, (list, tuple, array)):
+            return (list(self.operand),)
+        return super().params
+
+    def _format(self, operand, param=None):
+        if param is None:
+            param = Flavor.get().param
+        if isinstance(operand, (list, tuple, array)):
+            return '(%s)' % param
+        return super()._format(operand, param=param)
+
+
+class Any(_ArrayOperator):
     __slots__ = ()
     _operator = 'ANY'
 
 
 Some = Any
 
 
-class All(UnaryOperator):
+class All(_ArrayOperator):
     __slots__ = ()
     _operator = 'ALL'
 
diff --git a/sql/tests/test_operators.py b/sql/tests/test_operators.py
@@ -6,10 +6,10 @@
 
 from sql import Flavor, Literal, Null, Table
 from sql.operators import (
-    Abs, And, Between, Div, Equal, Exists, FloorDiv, Greater, GreaterEqual,
-    ILike, In, Is, IsDistinct, IsNot, IsNotDistinct, Less, LessEqual, Like,
-    LShift, Mod, Mul, Neg, Not, NotBetween, NotEqual, NotILike, NotIn, NotLike,
-    Operator, Or, Pos, Pow, RShift, Sub)
+    Abs, And, Any, Between, Div, Equal, Exists, FloorDiv, Greater,
+    GreaterEqual, ILike, In, Is, IsDistinct, IsNot, IsNotDistinct, Less,
+    LessEqual, Like, LShift, Mod, Mul, Neg, Not, NotBetween, NotEqual,
+    NotILike, NotIn, NotLike, Operator, Or, Pos, Pow, RShift, Sub)
 
 
 class TestOperators(unittest.TestCase):
@@ -418,3 +418,21 @@ def test_floordiv(self):
                 self.assertIn(
                     'FloorDiv operator is deprecated, use Div function',
                     str(w[-1].message))
+
+    def test_any(self):
+        any_ = Any(self.table.select(self.table.c1, where=self.table.c2 == 1))
+        self.assertEqual(str(any_),
+            'ANY (SELECT "a"."c1" FROM "t" AS "a" WHERE "a"."c2" = %s)')
+        self.assertEqual(any_.params, (1,))
+
+        for value in [[1, 2, 3], (1, 2, 3), array('l', [1, 2, 3])]:
+            with self.subTest(value=value):
+                any_ = Any(value)
+                self.assertEqual(str(any_), 'ANY (%s)')
+                self.assertEqual(any_.params, ([1, 2, 3],))
+
+    def test_binary_unary(self):
+        operator = Equal(self.table.c1, Any([1, 2, 3]))
+
+        self.assertEqual(str(operator), '"c1" = ANY (%s)')
+        self.assertEqual(operator.params, ([1, 2, 3],))

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+* Add support for array operators`
`1`	`2`	`* Remove the parentheses around the unary and binary operators`
`2`	`3`	`* Use the ordinal number as aliases for GROUP BY`
`3`	`4`	`* Check the coherence of the aliases of GROUP BY and ORDER BY expressions`