From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 23 Jan 2016 20:32:10 +0000 (-0500)
Subject: - use regex here, columns dont matter, keep coming up with different orderings
X-Git-Tag: rel_1_1_0b1~84^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77a4794ed24c326d77c4395c7776cc4ccee9c856;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- use regex here, columns dont matter, keep coming up with different orderings
---

diff --git a/test/orm/inheritance/test_basic.py b/test/orm/inheritance/test_basic.py
index bc418596a6..5f03a613b2 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, Or
+from sqlalchemy.testing.assertsql import AllOf, CompiledSQL, RegexSQL, Or
 from sqlalchemy.sql import table, column
 from sqlalchemy import testing
 from sqlalchemy.testing import engines
@@ -1212,8 +1212,8 @@ class PassiveDeletesTest(fixtures.MappedTest):
         with self.sql_execution_asserter(testing.db) as asserter:
             s.flush()
         asserter.assert_(
-            CompiledSQL(
-                "SELECT c.bid AS c_bid, c.cid AS c_cid "
+            RegexSQL(
+                "SELECT .* "
                 "FROM c WHERE :param_1 = c.bid",
                 [{'param_1': 3}]
             ),