- fixed endless loop bug which could occur

within a mapper's deferred load of
inherited attributes.
- declarative initialization of Columns adjusted so that
non-renamed columns initialize in the same way as a non
declarative mapper.   This allows an inheriting mapper
to set up its same-named "id" columns in particular
such that the parent "id" column is favored over the child
column, reducing database round trips when this value
is requested.

1 files changed, 7 insertions, 0 deletions

diff --git a/lib/sqlalchemy/ext/declarative.py b/lib/sqlalchemy/ext/declarative.py
index 47ee427dd..65af2da7a 100644
--- a/lib/sqlalchemy/ext/declarative.py
+++ b/lib/sqlalchemy/ext/declarative.py
@@ -270,6 +270,13 @@ def _as_declarative(cls, classname, dict_):
                 elif isinstance(c, Column):
                     _undefer_column_name(key, c)
                     cols.append(c)
+                    # if the column is the same name as the key, 
+                    # remove it from the explicit properties dict.
+                    # the normal rules for assigning column-based properties
+                    # will take over, including precedence of columns
+                    # in multi-column ColumnProperties.
+                    if key == c.key:
+                        del our_stuff[key]
             cls.__table__ = table = Table(tablename, cls.metadata,
                                           *(tuple(cols) + tuple(args)), **table_kw)
     else: