From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 20 Apr 2013 15:44:27 +0000 (-0400)
Subject: order the properties here to get the SQL to be deterministic
X-Git-Tag: rel_0_8_1~12^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=666fda3c9c45e5a710abb355b1052b3ef4775cf5;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

order the properties here to get the SQL to be deterministic
---

diff --git a/test/orm/inheritance/test_basic.py b/test/orm/inheritance/test_basic.py
index f883a07a7b..bbfa543830 100644
--- a/test/orm/inheritance/test_basic.py
+++ b/test/orm/inheritance/test_basic.py
@@ -1649,10 +1649,10 @@ class OptimizedLoadTest(fixtures.MappedTest):
             pass
 
         mapper(Base, base)
-        mapper(JoinBase, base.outerjoin(sub), properties={
-                'id': [base.c.id, sub.c.id],
-                'counter': [base.c.counter, sub.c.counter]
-            })
+        mapper(JoinBase, base.outerjoin(sub), properties=util.OrderedDict(
+                [('id', [base.c.id, sub.c.id]),
+                ('counter', [base.c.counter, sub.c.counter])])
+            )
         mapper(SubJoinBase, inherits=JoinBase)
 
         sess = Session()
@@ -1672,9 +1672,9 @@ class OptimizedLoadTest(fixtures.MappedTest):
             testing.db,
             go,
             CompiledSQL(
-                "SELECT base.counter AS base_counter, "
-                "sub.counter AS sub_counter, base.id AS base_id, "
-                "sub.id AS sub_id, base.data AS base_data, "
+                "SELECT base.id AS base_id, sub.id AS sub_id, "
+                "base.counter AS base_counter, sub.counter AS sub_counter, "
+                "base.data AS base_data, "
                 "base.type AS base_type, sub.sub AS sub_sub, "
                 "sub.counter2 AS sub_counter2 FROM base "
                 "LEFT OUTER JOIN sub ON base.id = sub.id "