From: Mike Bayer Date: Sat, 19 Feb 2011 17:59:12 +0000 (-0500) Subject: - Fix error message referencing old @classproperty X-Git-Tag: rel_0_6_7~31 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35b93e482db53d7fd6843ca31f9046d2424ede54;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git - Fix error message referencing old @classproperty name to reference @declared_attr [ticket:2061] --- diff --git a/CHANGES b/CHANGES index 4fb637271a..54a546cf58 100644 --- a/CHANGES +++ b/CHANGES @@ -68,6 +68,8 @@ CHANGES 'metadata' is used for a column attribute on a declarative class. [ticket:2050] + - Fix error message referencing old @classproperty + name to reference @declared_attr [ticket:2061] 0.6.6 ===== diff --git a/lib/sqlalchemy/ext/declarative.py b/lib/sqlalchemy/ext/declarative.py index 6517290582..23905ab415 100755 --- a/lib/sqlalchemy/ext/declarative.py +++ b/lib/sqlalchemy/ext/declarative.py @@ -946,7 +946,7 @@ def _as_declarative(cls, classname, dict_): if obj.foreign_keys: raise exc.InvalidRequestError( "Columns with foreign keys to other columns " - "must be declared as @classproperty callables " + "must be declared as @declared_attr callables " "on declarative mixin classes. ") if name not in dict_ and not ( '__table__' in dict_ and @@ -961,7 +961,7 @@ def _as_declarative(cls, classname, dict_): raise exc.InvalidRequestError( "Mapper properties (i.e. deferred," "column_property(), relationship(), etc.) must " - "be declared as @classproperty callables " + "be declared as @declared_attr callables " "on declarative mixin classes.") elif isinstance(obj, declarative_props): dict_[name] = ret = \