summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/build/changelog/changelog_08.rst6
-rw-r--r--examples/dogpile_caching/caching_query.py3
2 files changed, 8 insertions, 1 deletions
diff --git a/doc/build/changelog/changelog_08.rst b/doc/build/changelog/changelog_08.rst
index b8ae66e44..3f7a48848 100644
--- a/doc/build/changelog/changelog_08.rst
+++ b/doc/build/changelog/changelog_08.rst
@@ -7,6 +7,12 @@
:version: 0.8.0
.. change::
+ :tags: examples, bug
+
+ Fixed a regression in the examples/dogpile_caching example
+ which was due to the change in :ticket:`2614`.
+
+ .. change::
:tags: orm, bug
:tickets: 2640
diff --git a/examples/dogpile_caching/caching_query.py b/examples/dogpile_caching/caching_query.py
index fb532fa63..9a705cf31 100644
--- a/examples/dogpile_caching/caching_query.py
+++ b/examples/dogpile_caching/caching_query.py
@@ -233,7 +233,8 @@ class RelationshipCache(MapperOption):
"""
if query._current_path:
- mapper, key = query._current_path[-2:]
+ mapper, prop = query._current_path[-2:]
+ key = prop.key
for cls in mapper.class_.__mro__:
if (cls, key) in self._relationship_options: