- Fixed obscure mapper compilation issue when inheriting

mappers are used which would result in un-initialized
attributes.

diff --git a/CHANGES b/CHANGES
index 04e7d2d145c9c257074ee82e35f32e4c17a28561..6161ae6de222ba48cf063b4f5abbf8abbefac6b2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -54,6 +54,10 @@ CHANGES
       from a base class to a joined-table subclass would 
       not configure correctly.
 
+    - Fixed obscure mapper compilation issue when inheriting
+      mappers are used which would result in un-initialized
+      attributes.
+      
     - Fixed documentation for session weak_identity_map - 
       the default value is True, indicating a weak
       referencing map in use.

diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index e5dbb4d03978734a61ff3f93a91a202132b703fb..8af6153d6bf463b65b4a9c2bbf9472bf27027449 100644 (file)
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -682,7 +682,7 @@ class Mapper(object):
         for key, prop in l:
             self._log("initialize prop " + key)
             
-            if not prop._compile_started:
+            if prop.parent is self and not prop._compile_started:
                 prop.init()
             
             if prop._compile_finished: