From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 21 Jan 2007 19:54:12 +0000 (+0000)
Subject: better error message from [ticket:429]
X-Git-Tag: rel_0_3_4~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=546f5d63e5412190297f7a5c6c0834241a0b3851;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

better error message from [ticket:429]
---

diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index c8c14873f5..dc2965ab37 100644
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -681,9 +681,10 @@ class Mapper(object):
         self.__log("_compile_property(%s, %s)" % (key, prop.__class__.__name__))
 
         if not isinstance(prop, MapperProperty):
-            prop = self._create_prop_from_column(prop, skipmissing=skipmissing)
-            if prop is None:
-                raise exceptions.ArgumentError("'%s' is not an instance of MapperProperty or Column" % repr(prop))
+            col = self._create_prop_from_column(prop, skipmissing=skipmissing)
+            if col is None:
+                raise exceptions.ArgumentError("%s=%r is not an instance of MapperProperty or Column" % (key, prop))
+            prop = col
 
         self.__props[key] = prop
         if setparent: