From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 8 Jan 2013 15:59:26 +0000 (-0500)
Subject: Fixed a regression in the examples/dogpile_caching example
X-Git-Tag: rel_0_8_0~35^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f3cefeba8d63ceb15dcffa358c2ffdebee16ab1;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Fixed a regression in the examples/dogpile_caching example
which was due to the change in #2614.
---

diff --git a/doc/build/changelog/changelog_08.rst b/doc/build/changelog/changelog_08.rst
index b8ae66e44d..3f7a488489 100644
--- a/doc/build/changelog/changelog_08.rst
+++ b/doc/build/changelog/changelog_08.rst
@@ -6,6 +6,12 @@
 .. changelog::
     :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 fb532fa63d..9a705cf314 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: