diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-10-01 20:29:04 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-10-01 20:29:04 -0400 |
| commit | 83a87b3f5499cdd28a4e8e79f01f2f477793d560 (patch) | |
| tree | 0af2b3adc02b966ed042962faec24fc94837ac49 /lib/sqlalchemy/orm | |
| parent | 755aca7f5f3f33339dce4f4b6b92b8b7a9c3d180 (diff) | |
| download | sqlalchemy-83a87b3f5499cdd28a4e8e79f01f2f477793d560.tar.gz | |
- add additional logic that duplicates mapper's prop.copy(); prop.columns.append(col)
logic when columns are present in a joined subclass with an attribute name different
than the column name itself [ticket:1931]
- add coverage to verify that we need to check (obj.name or name) when
deciding if a Column from a mixin should be added to the mapped table
Diffstat (limited to 'lib/sqlalchemy/orm')
| -rw-r--r-- | lib/sqlalchemy/orm/mapper.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py index d27b99601..378570723 100644 --- a/lib/sqlalchemy/orm/mapper.py +++ b/lib/sqlalchemy/orm/mapper.py @@ -639,7 +639,9 @@ class Mapper(object): "or more attributes for these same-named columns " "explicitly." % (prop.columns[-1], column, key)) - + + # this hypothetically changes to + # prop.columns.insert(0, column) when we do [ticket:1892] prop.columns.append(column) self._log("appending to existing ColumnProperty %s" % (key)) |
