From dbdf4f25e2b1054e8f843f8ed0256ece86d68080 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Audrius=20Ka=C5=BEukauskas?= <audrius@neutrino.lt>
Date: Mon, 28 Jan 2013 19:58:06 +0200
Subject: Add ANY/ALL construct support for PostgreSQL's ARRAY type

---
 lib/sqlalchemy/dialects/postgresql/__init__.py |  2 +-
 lib/sqlalchemy/dialects/postgresql/base.py     | 62 ++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 1 deletion(-)

(limited to 'lib/sqlalchemy/dialects/postgresql')

diff --git a/lib/sqlalchemy/dialects/postgresql/__init__.py b/lib/sqlalchemy/dialects/postgresql/__init__.py
index 3b35bbcdb..5dc1e555c 100644
--- a/lib/sqlalchemy/dialects/postgresql/__init__.py
+++ b/lib/sqlalchemy/dialects/postgresql/__init__.py
@@ -11,7 +11,7 @@ base.dialect = psycopg2.dialect
 from .base import \
     INTEGER, BIGINT, SMALLINT, VARCHAR, CHAR, TEXT, NUMERIC, FLOAT, REAL, \
     INET, CIDR, UUID, BIT, MACADDR, DOUBLE_PRECISION, TIMESTAMP, TIME, \
-    DATE, BYTEA, BOOLEAN, INTERVAL, ARRAY, ENUM, dialect, array
+    DATE, BYTEA, BOOLEAN, INTERVAL, ARRAY, ENUM, dialect, array, Any, All
 from .hstore import HSTORE, hstore
 
 __all__ = (
diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py
index 3de727e94..de150f03f 100644
--- a/lib/sqlalchemy/dialects/postgresql/base.py
+++ b/lib/sqlalchemy/dialects/postgresql/base.py
@@ -365,6 +365,40 @@ class _Slice(expression.ColumnElement):
                             operators.getitem, slice_.stop)
 
 
+class Any(expression.ColumnElement):
+    """Return the clause ``left operator ANY (right)``.  ``right`` must be
+    an array expression.
+
+    See also:
+
+    :class:`.postgresql.ARRAY`
+    """
+    __visit_name__ = 'any'
+
+    def __init__(self, left, right, operator=operators.eq):
+        self.type = sqltypes.Boolean()
+        self.left = expression._literal_as_binds(left)
+        self.right = right
+        self.operator = operator
+
+
+class All(expression.ColumnElement):
+    """Return the clause ``left operator ALL (right)``.  ``right`` must be
+    an array expression.
+
+    See also:
+
+    :class:`.postgresql.ARRAY`
+    """
+    __visit_name__ = 'all'
+
+    def __init__(self, left, right, operator=operators.eq):
+        self.type = sqltypes.Boolean()
+        self.left = expression._literal_as_binds(left)
+        self.right = right
+        self.operator = operator
+
+
 class array(expression.Tuple):
     """A Postgresql ARRAY literal.
 
@@ -502,6 +536,20 @@ class ARRAY(sqltypes.Concatenable, sqltypes.TypeEngine):
             return self._binary_operate(self.expr, operators.getitem, index,
                             result_type=return_type)
 
+        def any(self, other, operator=operators.eq):
+            """Return ``other operator ANY (array)`` clause.  Argument places
+            are switched, because ANY requires array expression to be on the
+            right hand-side.
+            """
+            return Any(other, self.expr, operator=operator)
+
+        def all(self, other, operator=operators.eq):
+            """Return ``other operator ALL (array)`` clause.  Argument places
+            are switched, because ALL requires array expression to be on the
+            right hand-side.
+            """
+            return All(other, self.expr, operator=operator)
+
         def contains(self, other, **kwargs):
             """Boolean expression.  Test if elements are a superset of the
             elements of the argument array expression.
@@ -807,6 +855,20 @@ class PGCompiler(compiler.SQLCompiler):
                     self.process(element.stop, **kw),
                 )
 
+    def visit_any(self, element, **kw):
+        return "%s%sANY (%s)" % (
+            self.process(element.left, **kw),
+            compiler.OPERATORS[element.operator],
+            self.process(element.right, **kw)
+        )
+
+    def visit_all(self, element, **kw):
+        return "%s%sALL (%s)" % (
+            self.process(element.left, **kw),
+            compiler.OPERATORS[element.operator],
+            self.process(element.right, **kw)
+        )
+
     def visit_getitem_binary(self, binary, operator, **kw):
         return "%s[%s]" % (
                 self.process(binary.left, **kw),
-- 
cgit v1.2.1