Fix SQL assertions to match actual query output

diff --git a/test/orm/test_relationship_criteria.py b/test/orm/test_relationship_criteria.py
index 1a620167c50385856e7020e3c79c6c952584dfbd..96957555126d3358564539febb6386e61a43651b 100644 (file)
--- a/test/orm/test_relationship_criteria.py
+++ b/test/orm/test_relationship_criteria.py
@@ -2873,14 +2873,20 @@ class JoinedloadOfTypeAndTest(fixtures.DeclarativeMappedTest):
 
         asserter_.assert_(
             CompiledSQL(
-                "SELECT owner.id, owner.name, animal_1.id AS id_1,"
-                " animal_1.type, animal_1.name AS name_1,"
-                " animal_1.owner_id, dog_1.id AS id_2, dog_1.breed"
+                "SELECT owner.id, owner.name,"
+                " anon_1.animal_id, anon_1.animal_type,"
+                " anon_1.animal_name, anon_1.animal_owner_id,"
+                " anon_1.dog_id, anon_1.dog_breed"
                 " FROM owner LEFT OUTER JOIN"
-                " (animal AS animal_1 JOIN dog AS dog_1"
-                " ON animal_1.id = dog_1.id)"
-                " ON owner.id = animal_1.owner_id"
-                " AND dog_1.breed = :breed_1",
+                " (SELECT animal.id AS animal_id,"
+                " animal.type AS animal_type,"
+                " animal.name AS animal_name,"
+                " animal.owner_id AS animal_owner_id,"
+                " dog.id AS dog_id, dog.breed AS dog_breed"
+                " FROM animal LEFT OUTER JOIN dog"
+                " ON animal.id = dog.id) AS anon_1"
+                " ON owner.id = anon_1.animal_owner_id"
+                " AND anon_1.dog_breed = :breed_1",
             ),
         )
 
@@ -2903,14 +2909,15 @@ class JoinedloadOfTypeAndTest(fixtures.DeclarativeMappedTest):
                 "SELECT owner.id, owner.name FROM owner",
             ),
             CompiledSQL(
-                "SELECT animal_1.owner_id AS animal_1_owner_id,"
-                " animal_1.id AS animal_1_id, animal_1.type AS"
-                " animal_1_type, animal_1.name AS animal_1_name,"
-                " dog_1.id AS dog_1_id, dog_1.breed AS dog_1_breed"
-                " FROM animal AS animal_1 JOIN dog AS dog_1"
-                " ON animal_1.id = dog_1.id"
-                " WHERE animal_1.owner_id IN"
+                "SELECT animal.id AS animal_id,"
+                " animal.type AS animal_type,"
+                " animal.name AS animal_name,"
+                " animal.owner_id AS animal_owner_id,"
+                " dog.id AS dog_id, dog.breed AS dog_breed"
+                " FROM animal LEFT OUTER JOIN dog"
+                " ON animal.id = dog.id"
+                " WHERE animal.owner_id IN"
                 " (__[POSTCOMPILE_primary_keys])"
-                " AND dog_1.breed = :breed_1",
+                " AND dog.breed = :breed_1",
             ),
         )