summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/engine
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2007-07-15 15:40:09 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2007-07-15 15:40:09 +0000
commit8cb8daaafef15ec9ae7bb58a3fc783b73278a1a1 (patch)
treebc7884ca836d20a622517e63fd5c6053da24b4b0 /lib/sqlalchemy/engine
parent471c3f81022fd44ec8659528a67a2b9c0330f815 (diff)
downloadsqlalchemy-8cb8daaafef15ec9ae7bb58a3fc783b73278a1a1.tar.gz
- fixed "ambiguous column" result detection, when dupe col names exist
in a result [ticket:657]
Diffstat (limited to 'lib/sqlalchemy/engine')
-rw-r--r--lib/sqlalchemy/engine/base.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index 99688a48f..dc197eb19 100644
--- a/lib/sqlalchemy/engine/base.py
+++ b/lib/sqlalchemy/engine/base.py
@@ -885,7 +885,7 @@ class ResultProxy(object):
if rec[0] is None:
raise DBAPIError("None for metadata " + colname)
if self.__props.setdefault(colname.lower(), rec) is not rec:
- self.__props[colname.lower()] = (ResultProxy.AmbiguousColumn(colname), 0)
+ self.__props[colname.lower()] = (type, ResultProxy.AmbiguousColumn(colname), 0)
self.__keys.append(colname)
self.__props[i] = rec