summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2016-11-10 14:24:48 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2016-11-10 17:36:41 -0500
commitf2eb4aac9517a3775411c2ecf0f588ffd0d790f6 (patch)
treeaaac53b6e623bffcb9f6aa2d66b08f2d82b2494b /lib/sqlalchemy
parent03429812125c0265b90f6e1d706d132b88a0161c (diff)
downloadsqlalchemy-f2eb4aac9517a3775411c2ecf0f588ffd0d790f6.tar.gz
Use configured props for mapper.attrs, mapper.all_orm_descriptors
Fixed bug where the :attr:`.Mapper.attrs`, :attr:`.Mapper.all_orm_descriptors` and other derived attributes would fail to refresh when mapper properties or other ORM constructs were added to the mapper/class after these accessors were first called. (also trying different ways to get the changelog to merge cleanly) Change-Id: Iaecdb4b3d8c3a3b44302a5880476e60a1f4e27d9 Fixes: #3778
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/orm/mapper.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index 87f2a24b0..5156e432c 100644
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -2111,7 +2111,7 @@ class Mapper(InspectionAttr):
continue
yield c
- @util.memoized_property
+ @_memoized_configured_property
def attrs(self):
"""A namespace of all :class:`.MapperProperty` objects
associated this mapper.
@@ -2149,7 +2149,7 @@ class Mapper(InspectionAttr):
configure_mappers()
return util.ImmutableProperties(self._props)
- @util.memoized_property
+ @_memoized_configured_property
def all_orm_descriptors(self):
"""A namespace of all :class:`.InspectionAttr` attributes associated
with the mapped class.