Added a new exception to detect the case where two

subclasses are being loaded using with_polymorphic(),
each subclass contains a relationship attribute of the same
name, and eager loading is being applied to one or both.
This is an ongoing bug which can't be immediately fixed,
so since the results are usually wrong in any case it raises an
exception for now.   0.7 has the same issue, so an exception
raise here probably means the code was returning the wrong
data in 0.7.  [ticket:2614]

1 files changed, 6 insertions, 0 deletions

diff --git a/lib/sqlalchemy/orm/util.py b/lib/sqlalchemy/orm/util.py
index 97baffc9a..e5e725138 100644
--- a/lib/sqlalchemy/orm/util.py
+++ b/lib/sqlalchemy/orm/util.py
@@ -279,6 +279,12 @@ class PathRegistry(object):
     def set(self, reg, key, value):
         reg._attributes[(key, self.reduced_path)] = value
 
+    def replace(self, reg, key, value):
+        path_key = (key, self.reduced_path)
+        existing = reg._attributes.get(path_key, None)
+        reg._attributes[path_key] = value
+        return existing
+
     def setdefault(self, reg, key, value):
         reg._attributes.setdefault((key, self.reduced_path), value)