diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-08-02 19:18:24 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-08-02 19:18:24 -0400 |
| commit | 31a28392d1ebfd04870506d182b1a6bc5f2101c5 (patch) | |
| tree | c356c7e21884dfed80be3bc18bc7fc29d1eabc6e /lib/sqlalchemy/ext/declarative.py | |
| parent | dba3ad87b5a762272a11450a18955468d019fe80 (diff) | |
| download | sqlalchemy-31a28392d1ebfd04870506d182b1a6bc5f2101c5.tar.gz | |
- Fixed bug where "Can't add additional column" message
would display the wrong name.
Diffstat (limited to 'lib/sqlalchemy/ext/declarative.py')
| -rwxr-xr-x | lib/sqlalchemy/ext/declarative.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/sqlalchemy/ext/declarative.py b/lib/sqlalchemy/ext/declarative.py index 7f9dacbb0..712a563c3 100755 --- a/lib/sqlalchemy/ext/declarative.py +++ b/lib/sqlalchemy/ext/declarative.py @@ -928,6 +928,7 @@ def _as_declarative(cls, classname, dict_): cls._decl_class_registry[classname] = cls our_stuff = util.OrderedDict() + for k in dict_: value = dict_[k] if isinstance(value, util.classproperty): @@ -998,7 +999,7 @@ def _as_declarative(cls, classname, dict_): if not table.c.contains_column(c): raise exceptions.ArgumentError( "Can't add additional column %r when " - "specifying __table__" % key + "specifying __table__" % c.key ) if 'inherits' not in mapper_args: |