diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2005-11-01 06:09:31 +0000 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2005-11-01 06:09:31 +0000 |
commit | 7d6b4bebffa78aaf13cf8b36afb73ec19be12c2a (patch) | |
tree | cdbc697854a51865023b6c17ea5065fcd1bd4e73 /lib/sqlalchemy/engine.py | |
parent | dc20da65a21b1457de8868640a2de369ed4fdf3a (diff) | |
download | sqlalchemy-7d6b4bebffa78aaf13cf8b36afb73ec19be12c2a.tar.gz |
Diffstat (limited to 'lib/sqlalchemy/engine.py')
-rw-r--r-- | lib/sqlalchemy/engine.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/sqlalchemy/engine.py b/lib/sqlalchemy/engine.py index 3d8c41221..70f3f03da 100644 --- a/lib/sqlalchemy/engine.py +++ b/lib/sqlalchemy/engine.py @@ -287,6 +287,12 @@ class ResultProxy: #the Column's 'label', 'key', and 'name' properties are searched in that order. """ + class AmbiguousColumn(object): + def __init__(self, key): + self.key = key + def convert_result_value(self, arg): + raise "Ambiguous column name '%s' in result set! try 'use_labels' option on select statement." % (self.key) + def __init__(self, cursor, engine, typemap = None): self.cursor = cursor self.echo = engine.echo @@ -301,7 +307,7 @@ class ResultProxy: else: rec = (types.NULLTYPE, i) if self.props.setdefault(item[0].lower(), rec) is not rec: - raise "Duplicate column name '%s' in result set! try 'use_labels' option on select statement" % (item[0].lower()) + self.props[item[0].lower()] = (ResultProxy.AmbiguousColumn(item[0].lower()), 0) self.props[i] = rec i+=1 |