- Query.statement, Query.subquery(), etc. now transfer

the values of bind parameters, i.e. those specified
by query.params(), into the resulting SQL expression.
Previously the values would not be transferred
and bind parameters would come out as None.

- Subquery-eager-loading now works with Query objects
which include params(), as well as get() Queries.

2 files changed, 6 insertions, 2 deletions

diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index ae6624d47..50be13088 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -399,8 +399,11 @@ class Query(object):
         
         """
 
-        return self._compile_context(labels=self._with_labels).\
-                        statement._annotate({'_halt_adapt': True})
+        stmt = self._compile_context(labels=self._with_labels).\
+                        statement
+        if self._params:
+            stmt = stmt.params(self._params)
+        return stmt._annotate({'_halt_adapt': True})
 
     def subquery(self):
         """return the full SELECT statement represented by this Query, 
diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py
index 5b5dd312d..62602ff37 100644
--- a/lib/sqlalchemy/orm/strategies.py
+++ b/lib/sqlalchemy/orm/strategies.py
@@ -700,6 +700,7 @@ class SubqueryLoader(AbstractRelationshipLoader):
         # reformat the original query
         # to look only for significant columns
         q = orig_query._clone()
+
         # TODO: why does polymporphic etc. require hardcoding 
         # into _adapt_col_list ?  Does query.add_columns(...) work
         # with polymorphic loading ?