From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 22 Jun 2014 00:27:19 +0000 (-0400)
Subject: - use new Or() directive to test for both SQL variants here, which can vary
X-Git-Tag: rel_1_0_0b1~382
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=20e64ad6b8bd08b966196388d0f353c53827bdbb;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- use new Or() directive to test for both SQL variants here, which can vary
based on hash ordering of the ClassManager
---

diff --git a/test/orm/inheritance/test_basic.py b/test/orm/inheritance/test_basic.py
index bac5ad57c0..d8b2a44af0 100644
--- a/test/orm/inheritance/test_basic.py
+++ b/test/orm/inheritance/test_basic.py
@@ -5,7 +5,7 @@ from sqlalchemy import exc as sa_exc, util, event
 from sqlalchemy.orm import *
 from sqlalchemy.orm.util import instance_str
 from sqlalchemy.orm import exc as orm_exc, attributes
-from sqlalchemy.testing.assertsql import AllOf, CompiledSQL
+from sqlalchemy.testing.assertsql import AllOf, CompiledSQL, Or
 from sqlalchemy.sql import table, column
 from sqlalchemy import testing
 from sqlalchemy.testing import engines
@@ -2024,12 +2024,21 @@ class OptimizedLoadTest(fixtures.MappedTest):
         self.assert_sql_execution(
             testing.db,
             go,
-            CompiledSQL(
-                "SELECT subsub.subsubcounter2 AS subsub_subsubcounter2, "
-                "sub.subcounter2 AS sub_subcounter2 FROM subsub, sub "
-                "WHERE :param_1 = sub.id AND sub.id = subsub.id",
-                lambda ctx:{'param_1': s1.id}
-            ),
+            Or(
+                CompiledSQL(
+                    "SELECT subsub.subsubcounter2 AS subsub_subsubcounter2, "
+                    "sub.subcounter2 AS sub_subcounter2 FROM subsub, sub "
+                    "WHERE :param_1 = sub.id AND sub.id = subsub.id",
+                    lambda ctx: {'param_1': s1.id}
+                ),
+                CompiledSQL(
+                    "SELECT sub.subcounter2 AS sub_subcounter2, "
+                    "subsub.subsubcounter2 AS subsub_subsubcounter2 "
+                    "FROM sub, subsub "
+                    "WHERE :param_1 = sub.id AND sub.id = subsub.id",
+                    lambda ctx: {'param_1': s1.id}
+                ),
+            )
         )
 
 class TransientInheritingGCTest(fixtures.TestBase):