From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 18 Aug 2020 18:17:06 +0000 (-0400)
Subject: Deliver straight BinaryExpr w/ no negate for any() / all()
X-Git-Tag: rel_1_3_20~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8b34f3c4bbd21d41bac9884e732e798ff25872b8;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Deliver straight BinaryExpr w/ no negate for any() / all()

Adjusted the :meth:`_types.ARRAY.Comparator.any` and
:meth:`_types.ARRAY.Comparator.all` methods to implement a straight "NOT"
operation for negation, rather than negating the comparison operator.

Fixes: #5518
Change-Id: I87ee9278c321aafe51a679fcfcbb5fbb11307fda
(cherry picked from commit 8bc793c4dbc876722dfaad0ca731938c70b54b6c)
---

diff --git a/doc/build/changelog/unreleased_13/5518.rst b/doc/build/changelog/unreleased_13/5518.rst
new file mode 100644
index 0000000000..1cd2a259fe
--- /dev/null
+++ b/doc/build/changelog/unreleased_13/5518.rst
@@ -0,0 +1,7 @@
+.. change::
+    :tags: bug, postgresql
+    :tickets: 5518
+
+    Adjusted the :meth:`_types.ARRAY.Comparator.any` and
+    :meth:`_types.ARRAY.Comparator.all` methods to implement a straight "NOT"
+    operation for negation, rather than negating the comparison operator.
\ No newline at end of file
diff --git a/lib/sqlalchemy/sql/sqltypes.py b/lib/sqlalchemy/sql/sqltypes.py
index 7309774858..f6d1c49ea3 100644
--- a/lib/sqlalchemy/sql/sqltypes.py
+++ b/lib/sqlalchemy/sql/sqltypes.py
@@ -2636,9 +2636,13 @@ class ARRAY(SchemaEventTarget, Indexable, Concatenable, TypeEngine):
 
             """
             operator = operator if operator else operators.eq
-            return operator(
+
+            # send plain BinaryExpression so that negate remains at None,
+            # leading to NOT expr for negation.
+            return elements.BinaryExpression(
                 elements._literal_as_binds(other),
                 elements.CollectionAggregate._create_any(self.expr),
+                operator,
             )
 
         @util.dependencies("sqlalchemy.sql.elements")
@@ -2671,9 +2675,13 @@ class ARRAY(SchemaEventTarget, Indexable, Concatenable, TypeEngine):
 
             """
             operator = operator if operator else operators.eq
-            return operator(
+
+            # send plain BinaryExpression so that negate remains at None,
+            # leading to NOT expr for negation.
+            return elements.BinaryExpression(
                 elements._literal_as_binds(other),
                 elements.CollectionAggregate._create_all(self.expr),
+                operator,
             )
 
     comparator_factory = Comparator
diff --git a/test/dialect/postgresql/test_compiler.py b/test/dialect/postgresql/test_compiler.py
index 57099f755c..7e082166ba 100644
--- a/test/dialect/postgresql/test_compiler.py
+++ b/test/dialect/postgresql/test_compiler.py
@@ -1226,6 +1226,27 @@ class CompileTest(fixtures.TestBase, AssertsCompiledSQL):
             "%(param_1)s = ANY (x)",
             checkparams={"param_1": 4},
         )
+
+        self.assert_compile(
+            c.any(5), "%(param_1)s = ANY (x)", checkparams={"param_1": 5},
+        )
+
+        self.assert_compile(
+            ~c.any(5),
+            "NOT (%(param_1)s = ANY (x))",
+            checkparams={"param_1": 5},
+        )
+
+        self.assert_compile(
+            c.all(5), "%(param_1)s = ALL (x)", checkparams={"param_1": 5},
+        )
+
+        self.assert_compile(
+            ~c.all(5),
+            "NOT (%(param_1)s = ALL (x))",
+            checkparams={"param_1": 5},
+        )
+
         self.assert_compile(
             c.any(5, operator=operators.ne),
             "%(param_1)s != ANY (x)",
diff --git a/test/sql/test_operators.py b/test/sql/test_operators.py
index 29ad2802f9..8b2648ff75 100644
--- a/test/sql/test_operators.py
+++ b/test/sql/test_operators.py
@@ -2790,6 +2790,15 @@ class AnyAllTest(fixtures.TestBase, testing.AssertsCompiledSQL):
             checkparams={"param_1": 5},
         )
 
+    def test_any_array_comparator_negate_accessor(self, t_fixture):
+        t = t_fixture
+
+        self.assert_compile(
+            ~t.c.arrval.any(5, operator.gt),
+            "NOT (:param_1 > ANY (tab1.arrval))",
+            checkparams={"param_1": 5},
+        )
+
     def test_all_array_comparator_accessor(self, t_fixture):
         t = t_fixture
 
@@ -2799,6 +2808,15 @@ class AnyAllTest(fixtures.TestBase, testing.AssertsCompiledSQL):
             checkparams={"param_1": 5},
         )
 
+    def test_all_array_comparator_negate_accessor(self, t_fixture):
+        t = t_fixture
+
+        self.assert_compile(
+            ~t.c.arrval.all(5, operator.gt),
+            "NOT (:param_1 > ALL (tab1.arrval))",
+            checkparams={"param_1": 5},
+        )
+
     def test_any_array_expression(self, t_fixture):
         t = t_fixture