summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/loading.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2015-06-29 13:47:27 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2015-06-29 13:49:44 -0400
commit4d6f4ed184b94e60d5d39eff7fae678d64e9aeaa (patch)
tree097988c3a6c6f3c3717f741ca963dc678a6f8aa5 /lib/sqlalchemy/orm/loading.py
parentfcb7c784e9479b9bff7de20c41a05bc1aa550ffb (diff)
downloadsqlalchemy-4d6f4ed184b94e60d5d39eff7fae678d64e9aeaa.tar.gz
- Fixed 1.0 regression where a "deferred" attribute would not populate
correctly if it were loaded within the "optimized inheritance load", which is a special SELECT emitted in the case of joined table inheritance used to populate expired or unloaded attributes against a joined table without loading the base table. This is related to the fact that SQLA 1.0 no longer guesses about loading deferred columns and must be directed explicitly. fixes #3468
Diffstat (limited to 'lib/sqlalchemy/orm/loading.py')
-rw-r--r--lib/sqlalchemy/orm/loading.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/loading.py b/lib/sqlalchemy/orm/loading.py
index 50afaf601..b81e98a58 100644
--- a/lib/sqlalchemy/orm/loading.py
+++ b/lib/sqlalchemy/orm/loading.py
@@ -17,6 +17,8 @@ from __future__ import absolute_import
from .. import util
from . import attributes, exc as orm_exc
from ..sql import util as sql_util
+from . import strategy_options
+
from .util import _none_set, state_str
from .base import _SET_DEFERRED_EXPIRED, _DEFER_FOR_STATE
from .. import exc as sa_exc
@@ -612,10 +614,17 @@ def load_scalar_attributes(mapper, state, attribute_names):
result = False
if mapper.inherits and not mapper.concrete:
+ # because we are using Core to produce a select() that we
+ # pass to the Query, we aren't calling setup() for mapped
+ # attributes; in 1.0 this means deferred attrs won't get loaded
+ # by default
statement = mapper._optimized_get_statement(state, attribute_names)
if statement is not None:
result = load_on_ident(
- session.query(mapper).from_statement(statement),
+ session.query(mapper).
+ options(
+ strategy_options.Load(mapper).undefer("*")
+ ).from_statement(statement),
None,
only_load_props=attribute_names,
refresh_state=state