- Fix error message referencing old @classproperty

    name to reference @declared_attr [ticket:2061]

2 files changed, 4 insertions, 2 deletions

diff --git a/CHANGES b/CHANGES
index f60c5fe7d..25c955ec2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -404,6 +404,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 c8c464d0d..0372d4dac 100755
--- a/lib/sqlalchemy/ext/declarative.py
+++ b/lib/sqlalchemy/ext/declarative.py
@@ -910,7 +910,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 
@@ -925,7 +925,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 = \