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

diff --git a/CHANGES b/CHANGES
index b49dec627baae8e6fd5a23b0be7c5d6ffadccd29..b23c18d39f782a481c0cf9f7c7e21e623addff05 100644 (file)
--- 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 f318cf4b32f3db296d3f1404e0b36ea9b7020b3c..5de64f9144609af9c521258889fdbf9a3d0461ec 100644 (file)
--- 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)