From d3ca4156495af556e448a8d3f6d5884d08ab2f9b Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Wed, 17 Nov 2010 10:55:10 -0500 Subject: - An error is raised if __table_args__ is not in tuple or dict format, and is not None. [ticket:1972] --- lib/sqlalchemy/ext/declarative.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib/sqlalchemy/ext/declarative.py') diff --git a/lib/sqlalchemy/ext/declarative.py b/lib/sqlalchemy/ext/declarative.py index dd2df63d3..3c6cab59a 100755 --- a/lib/sqlalchemy/ext/declarative.py +++ b/lib/sqlalchemy/ext/declarative.py @@ -999,6 +999,10 @@ def _as_declarative(cls, classname, dict_): isinstance(obj, declarative_props) ): table_args = cls.__table_args__ + if not isinstance(table_args, (tuple, dict, type(None))): + raise exceptions.ArgumentError( + "__table_args__ value must be a tuple, " + "dict, or None") if base is not cls: inherited_table_args = True elif class_mapped: -- cgit v1.2.1