- fix this import

- call loading.instances

diff --git a/lib/sqlalchemy/dialects/__init__.py b/lib/sqlalchemy/dialects/__init__.py
index 4d5aebf62c8b1fc6ca56392afb5748849dcae330..4b34da82e75748619d6d7cc78cb20544191bb121 100644 (file)
--- a/lib/sqlalchemy/dialects/__init__.py
+++ b/lib/sqlalchemy/dialects/__init__.py
@@ -18,7 +18,7 @@ __all__ = (
     'sybase',
     )
 
-from . import util
+from .. import util
 
 def _auto_fn(name):
     """default dialect importer.

diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index f0ef520f40643e0f0601c676d50581e5ec301455..ed600a2f087ec244579ffbcba8255d08a50b9816 100644 (file)
--- 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):