From 7a554d526745d6327e112460ea75f50d9ff2105f Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 14 Jun 2010 20:07:44 -0400 Subject: - 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. --- lib/sqlalchemy/orm/query.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'lib/sqlalchemy/orm/query.py') 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, -- cgit v1.2.1