From d48acff23bc04dafa958e76ef2ff614aa8d6751b Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sun, 26 Apr 2015 12:33:17 -0400 Subject: - Fixed issue in new :meth:`.QueryEvents.before_compile` event where changes made to the :class:`.Query` object's collection of entities to load within the event would render in the SQL, but would not be reflected during the loading process. fixes #3387 --- lib/sqlalchemy/__init__.py | 2 +- lib/sqlalchemy/orm/query.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py index 69ab88772..153b10a2b 100644 --- a/lib/sqlalchemy/__init__.py +++ b/lib/sqlalchemy/__init__.py @@ -120,7 +120,7 @@ from .schema import ( from .inspection import inspect from .engine import create_engine, engine_from_config -__version__ = '1.0.2' +__version__ = '1.0.3' def __go(lcls): diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index 2bd68899b..c3638f66d 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -2528,7 +2528,7 @@ class Query(object): close_with_result=True) result = conn.execute(querycontext.statement, self._params) - return loading.instances(self, result, querycontext) + return loading.instances(querycontext.query, result, querycontext) @property def column_descriptions(self): -- cgit v1.2.1