summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/base.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2019-10-11 14:45:24 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2019-10-16 13:33:01 -0400
commit33119301bb3efa143ebaaef22a7b5170f14a1331 (patch)
tree3097d7db5f2defabad7792539a8048f3c95c5c0c /lib/sqlalchemy/orm/base.py
parent657ec85e8733c64b9be2154c3169d31c15a06dce (diff)
downloadsqlalchemy-33119301bb3efa143ebaaef22a7b5170f14a1331.tar.gz
Implement raiseload for deferred columns
Added "raiseload" feature for ORM mapped columns. As part of this change, the behavior of "deferred" is now more strict; an attribute that is set up as "deferred" at the mapper level no longer participates in an "unexpire" operation; that is, when an unexpire loads all the expired columns of an object which are not themselves in a deferred group, those which are mapper-level deferred will never be loaded. Deferral options set at query time should always be reset by an expiration operation. Renames deferred_scalar_loader to expired_attribute_loader Unfortunately we can't have raiseload() do this because it would break existing wildcard behavior. Fixes: #4826 Change-Id: I30d9a30236e0b69134e4094fb7c1ad2267f089d1
Diffstat (limited to 'lib/sqlalchemy/orm/base.py')
-rw-r--r--lib/sqlalchemy/orm/base.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/sqlalchemy/orm/base.py b/lib/sqlalchemy/orm/base.py
index e52b6d8bb..6f8d19293 100644
--- a/lib/sqlalchemy/orm/base.py
+++ b/lib/sqlalchemy/orm/base.py
@@ -206,6 +206,8 @@ _SET_DEFERRED_EXPIRED = util.symbol("SET_DEFERRED_EXPIRED")
_DEFER_FOR_STATE = util.symbol("DEFER_FOR_STATE")
+_RAISE_FOR_STATE = util.symbol("RAISE_FOR_STATE")
+
def _assertions(*assertions):
@util.decorator