From: Ants Aasma <ants.aasma@gmail.com>
Date: Tue, 26 Jun 2007 19:07:51 +0000 (+0000)
Subject: merge 2791 from trunk, fix for bad error message (ticket #607)
X-Git-Tag: rel_0_4_6~173
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f630e98a6e9a756aa75804238ea995891229ab1;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merge 2791 from trunk, fix for bad error message (ticket #607)
---

diff --git a/CHANGES b/CHANGES
index b49dec627b..b23c18d39f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -66,6 +66,7 @@
     
 0.3.9
 - general
+    - better error message for NoSuchColumnError [ticket:607]
     - finally figured out how to get setuptools version in, available
       as sqlalchemy.__version__ [ticket:428]
 - ext
diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index f318cf4b32..5de64f9144 100644
--- a/lib/sqlalchemy/engine/base.py
+++ b/lib/sqlalchemy/engine/base.py
@@ -983,7 +983,7 @@ class ResultProxy(object):
                     rec = props[label]
 
             if not "rec" in locals():
-                raise exceptions.NoSuchColumnError("Could not locate column in row for column '%s'" % (repr(key)))
+                raise exceptions.NoSuchColumnError("Could not locate column in row for column '%s'" % (str(key)))
 
             return rec
         return util.PopulateDict(lookup_key)