diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sqlalchemy/ext/declarative.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/sqlalchemy/ext/declarative.py b/lib/sqlalchemy/ext/declarative.py index 79677c084..084ec2699 100644 --- a/lib/sqlalchemy/ext/declarative.py +++ b/lib/sqlalchemy/ext/declarative.py @@ -480,7 +480,9 @@ def _as_declarative(cls, classname, dict_): else: table = cls.__table__ if cols: - raise exceptions.ArgumentError("Can't add additional columns when specifying __table__") + for c in cols: + if not table.c.contains_column(c): + raise exceptions.ArgumentError("Can't add additional column %r when specifying __table__" % key) mapper_args = getattr(cls, '__mapper_args__', {}) if 'inherits' not in mapper_args: |