merge tip

diff --cc lib/sqlalchemy/dialects/mssql/base.py
Simple merge

diff --cc lib/sqlalchemy/dialects/mysql/base.py
Simple merge

diff --cc lib/sqlalchemy/dialects/postgresql/base.py
Simple merge

diff --cc lib/sqlalchemy/dialects/sqlite/base.py
Simple merge

diff --cc lib/sqlalchemy/sql/compiler.py
Simple merge

diff --cc test/dialect/test_mysql.py
Simple merge

diff --cc test/orm/test_eager_relations.py
index 9ac214df49875a52c5859394edcadd0dd0968cb8,b70ad0973a38cdc6966d1f14d0ed1ab5d4f1d882..823a6d02b6fd1ce89d7ca88e669ea96183921fd6
--- 1/test/orm/test_eager_relations.py
--- 2/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

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

diff --cc test/sql/test_compiler.py
Simple merge