summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/ext/declarative.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/ext/declarative.py')
-rwxr-xr-xlib/sqlalchemy/ext/declarative.py3
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: