From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 6 Aug 2010 22:54:52 +0000 (-0400)
Subject: fix declarative
X-Git-Tag: rel_0_7b1~252^2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d0ed62f73d2465e06a26f3c82ef5e271c8fc460;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

fix declarative
---

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"