summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-06-23 14:59:42 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2012-06-23 14:59:42 -0400
commitee8b7d317850dc0852116efe457751f41e7c6cf8 (patch)
tree5dec78a4e7a687bd35755078e35ddfa21af1b25d /lib/sqlalchemy/orm
parent794fa13ce207c90b6cd124f044798c457c652683 (diff)
downloadsqlalchemy-ee8b7d317850dc0852116efe457751f41e7c6cf8.tar.gz
- fix this import
- call loading.instances
Diffstat (limited to 'lib/sqlalchemy/orm')
-rw-r--r--lib/sqlalchemy/orm/query.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index f0ef520f4..ed600a2f0 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -2242,7 +2242,7 @@ class Query(object):
close_with_result=True)
result = conn.execute(querycontext.statement, self._params)
- return self.instances(result, querycontext)
+ return loading.instances(self, result, querycontext)
@property
def column_descriptions(self):