summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/engine/base.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/engine/base.py')
-rw-r--r--lib/sqlalchemy/engine/base.py16
1 files changed, 3 insertions, 13 deletions
diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index 7e9d57d97..ad2b5df96 100644
--- a/lib/sqlalchemy/engine/base.py
+++ b/lib/sqlalchemy/engine/base.py
@@ -1287,19 +1287,9 @@ class ResultProxy(object):
elif isinstance(key, basestring) and key.lower() in props:
rec = props[key.lower()]
elif isinstance(key, expression.ColumnElement):
- try:
- if getattr(key, '_exact_match', False):
- # exact match flag means the label must be present in the
- # generated column_labels
- label = context.column_labels[key._label].lower()
- else:
- # otherwise, fall back to the straight name of the column
- # if not in generated labels
- label = context.column_labels.get(key._label, key.name).lower()
- if label in props:
- rec = props[label]
- except KeyError:
- pass
+ label = context.column_labels.get(key._label, key.name).lower()
+ if label in props:
+ rec = props[label]
if not "rec" in locals():
raise exceptions.NoSuchColumnError("Could not locate column in row for column '%s'" % (str(key)))