diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-10-21 16:54:39 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-10-21 16:54:39 -0400 |
| commit | c5579f77e26e1449f82888c4a95466a77642130d (patch) | |
| tree | 917d2c8578b353a85f89ed9793a0235e1dcb15e6 /lib/sqlalchemy/ext/declarative.py | |
| parent | ee345b055c2c0c44a6cee4f14f70ebb5e4725aab (diff) | |
| download | sqlalchemy-c5579f77e26e1449f82888c4a95466a77642130d.tar.gz | |
- A mixin can now specify a column that overrides
a column of the same name associated with a superclass.
Thanks to Oystein Haaland.
Diffstat (limited to 'lib/sqlalchemy/ext/declarative.py')
| -rwxr-xr-x | lib/sqlalchemy/ext/declarative.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/ext/declarative.py b/lib/sqlalchemy/ext/declarative.py index debfdfe57..dd2df63d3 100755 --- a/lib/sqlalchemy/ext/declarative.py +++ b/lib/sqlalchemy/ext/declarative.py @@ -1015,7 +1015,7 @@ def _as_declarative(cls, classname, dict_): if name not in dict_ and not ( '__table__' in dict_ and (obj.name or name) in dict_['__table__'].c - ): + ) and name not in potential_columns: potential_columns[name] = \ column_copies[obj] = \ obj.copy() |