]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
Improve test for empty and_ or_ 5062/head
authorFederico Caselli <cfederico87@gmail.com>
Sun, 29 Dec 2019 18:54:20 +0000 (19:54 +0100)
committerFederico Caselli <cfederico87@gmail.com>
Sun, 29 Dec 2019 18:54:20 +0000 (19:54 +0100)
test/engine/test_execute.py
test/sql/test_selectable.py

index acd309d621fde56f13c8d859b235b63da81db76b..133abd1a79eac22ab3b3c583e6c30cfc936146dd 100644 (file)
@@ -391,9 +391,10 @@ class ExecuteTest(fixtures.TestBase):
         for obj in (
             Table("foo", MetaData(), Column("x", Integer)),
             Column("x", Integer),
-            tsa.and_(True),
+            # a single clause in and_ is optimized away
+            tsa.and_(tsa.text("1=1"), tsa.text("1=1")),
+            tsa.and_(tsa.text("1=1"), tsa.text("1=1")).compile(),
             column("foo"),
-            tsa.and_(True).compile(),
             column("foo").compile(),
             MetaData(),
             Integer(),
index 6156fb870b4e16e569609c31dc02ee9e65e3a036..8c15a2f42d15e1c4b4c0e0d68a0c5f7df155efe1 100644 (file)
@@ -2678,8 +2678,9 @@ class ReprTest(fixtures.TestBase):
             elements.True_(),
             elements.False_(),
             elements.ClauseList(),
-            elements.BooleanClauseList.and_(True),
-            elements.BooleanClauseList.or_(False),
+            # a single clause in and_ | or_ is optimized away
+            elements.BooleanClauseList.and_(text('1=1'), text('1=1')),
+            elements.BooleanClauseList.or_(text('1=1'), text('1=1')),
             elements.Tuple(),
             elements.Case([]),
             elements.Extract("foo", column("x")),