From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 14 Nov 2010 23:25:13 +0000 (-0500)
Subject: merge tip
X-Git-Tag: rel_0_7b1~251^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6fb06409c622e0355e0a36817940035c33e17ce3;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merge tip
---

6fb06409c622e0355e0a36817940035c33e17ce3
diff --cc test/orm/test_eager_relations.py
index 9ac214df49,b70ad0973a..823a6d02b6
--- a/test/orm/test_eager_relations.py
+++ b/test/orm/test_eager_relations.py
@@@ -734,10 -730,24 +734,26 @@@ class EagerTest(_fixtures.FixtureTest, 
              "orders_1.description AS orders_1_description, orders_1.isopen AS orders_1_isopen "
              "FROM (SELECT users.id AS users_id, users.name AS users_name "
              "FROM users "
 -            " LIMIT 10) AS anon_1 LEFT OUTER JOIN orders AS orders_1 ON anon_1.users_id = "
 -            "orders_1.user_id LEFT OUTER JOIN addresses AS addresses_1 ON addresses_1.id = orders_1.address_id"
 -            ,use_default_dialect=True
 +            "LIMIT :param_1) AS anon_1 LEFT OUTER JOIN orders AS orders_1 ON anon_1.users_id = "
++            "orders_1.user_id LEFT OUTER JOIN addresses AS addresses_1 ON addresses_1.id = orders_1.address_id",
++            {'param_1':10},
++            use_default_dialect=True
+         )
 -
++        
+         self.assert_compile(
+             sess.query(User).options(joinedload("orders", innerjoin=True), 
+                                         joinedload("orders.address", innerjoin=True)).limit(10),
+             "SELECT anon_1.users_id AS anon_1_users_id, anon_1.users_name AS anon_1_users_name, "
+             "addresses_1.id AS addresses_1_id, addresses_1.user_id AS addresses_1_user_id, "
+             "addresses_1.email_address AS addresses_1_email_address, orders_1.id AS orders_1_id, "
+             "orders_1.user_id AS orders_1_user_id, orders_1.address_id AS orders_1_address_id, "
+             "orders_1.description AS orders_1_description, orders_1.isopen AS orders_1_isopen "
+             "FROM (SELECT users.id AS users_id, users.name AS users_name "
+             "FROM users "
 -            " LIMIT 10) AS anon_1 JOIN orders AS orders_1 ON anon_1.users_id = "
 -            "orders_1.user_id JOIN addresses AS addresses_1 ON addresses_1.id = orders_1.address_id"
 -            ,use_default_dialect=True
++            "LIMIT :param_1) AS anon_1 JOIN orders AS orders_1 ON anon_1.users_id = "
 +            "orders_1.user_id JOIN addresses AS addresses_1 ON addresses_1.id = orders_1.address_id",
 +            {'param_1':10},
 +            use_default_dialect=True
          )
          
      @testing.resolve_artifact_names