From 0d0ed62f73d2465e06a26f3c82ef5e271c8fc460 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Fri, 6 Aug 2010 18:54:52 -0400 Subject: [PATCH] fix declarative --- lib/sqlalchemy/ext/declarative.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/sqlalchemy/ext/declarative.py b/lib/sqlalchemy/ext/declarative.py index 2310f01ce3..dc7e5feb42 100755 --- a/lib/sqlalchemy/ext/declarative.py +++ b/lib/sqlalchemy/ext/declarative.py @@ -1151,12 +1151,13 @@ class _GetColumns(object): mapper = class_mapper(self.cls, compile=False) if mapper: - prop = mapper.get_property(key, raiseerr=False) - if prop is None: + if not mapper.has_property(key): raise exceptions.InvalidRequestError( "Class %r does not have a mapped column named %r" % (self.cls, key)) - elif not isinstance(prop, ColumnProperty): + + prop = mapper.get_property(key) + if not isinstance(prop, ColumnProperty): raise exceptions.InvalidRequestError( "Property %r is not an instance of" " ColumnProperty (i.e. does not correspond" -- 2.47.2