- merge reverse inheriting col order, [ticket:1892]

diff --cc lib/sqlalchemy/orm/mapper.py
Simple merge

diff --cc test/ext/test_declarative.py
Simple merge

diff --cc test/orm/inheritance/test_query.py
index 900337cf11a0171cdb06c344ec6eb42ca525975e,1d83df29c5a2232ee718b23143cf4c4df03a689c..db2475761ba3d81e482fe5b7863cdcf3fbafd2ed
--- 1/test/orm/inheritance/test_query.py
--- 2/test/orm/inheritance/test_query.py
+++ b/test/orm/inheritance/test_query.py
@@@ -1187,16 -1217,15 +1217,16 @@@ class SelfReferentialM2MTest(_base.Mapp
  
          # test that the splicing of the join works here, doesnt break in the middle of "parent join child1"
          self.assert_compile(q.limit(1).with_labels().statement, 
-         "SELECT anon_1.parent_id AS anon_1_parent_id, anon_1.child1_id AS anon_1_child1_id, "\
-         "anon_1.parent_cls AS anon_1_parent_cls, anon_2.parent_id AS anon_2_parent_id, "\
-         "anon_2.child2_id AS anon_2_child2_id, anon_2.parent_cls AS anon_2_parent_cls FROM "\
-         "(SELECT parent.id AS parent_id, child1.id AS child1_id, parent.cls AS parent_cls FROM parent "\
+         "SELECT anon_1.child1_id AS anon_1_child1_id, anon_1.parent_id AS anon_1_parent_id, "\
+         "anon_1.parent_cls AS anon_1_parent_cls, anon_2.child2_id AS anon_2_child2_id, "\
+         "anon_2.parent_id AS anon_2_parent_id, anon_2.parent_cls AS anon_2_parent_cls FROM "\
+         "(SELECT child1.id AS child1_id, parent.id AS parent_id, parent.cls AS parent_cls FROM parent "\
 -        "JOIN child1 ON parent.id = child1.id  LIMIT 1) AS anon_1 LEFT OUTER JOIN secondary AS secondary_1 "\
 +        "JOIN child1 ON parent.id = child1.id LIMIT :param_1) AS anon_1 LEFT OUTER JOIN secondary AS secondary_1 "\
          "ON anon_1.parent_id = secondary_1.right_id LEFT OUTER JOIN (SELECT parent.id AS parent_id, "\
          "parent.cls AS parent_cls, child2.id AS child2_id FROM parent JOIN child2 ON parent.id = child2.id) "\
 -        "AS anon_2 ON anon_2.parent_id = secondary_1.left_id"
 -        , dialect=default.DefaultDialect())
 +        "AS anon_2 ON anon_2.parent_id = secondary_1.left_id",
 +        {'param_1':1},
 +        dialect=default.DefaultDialect())
  
          # another way to check
          assert q.limit(1).with_labels().subquery().count().scalar() == 1

diff --cc test/orm/test_mapper.py
Simple merge