Fix select priority name (#525)

* Fix select map priority name (key)

* Fix select map priority name (key) - remove debug code

* Fix select map priority name (key) add test

Author: vir-mir

aiopg/sa/result.py

@@ -89,10 +89,7 @@ class ResultMetaData(object):
     def __init__(self, result_proxy, metadata):
         self._processors = processors = []
 
-        result_map = {}
-        if result_proxy._result_map:
-            result_map = {elem[0]: elem[3] for elem in
-                          result_proxy._result_map}
+        map_type, map_column_name = self.result_map(result_proxy._result_map)
 
         # We do not strictly need to store the processor in the key mapping,
         # though it is faster in the Python version (probably because of the
@@ -124,11 +121,9 @@ def __init__(self, result_proxy, metadata):
             #     colname = dialect.normalize_name(colname)
 
             name, obj, type_ = (
-                colname,
+                map_column_name.get(colname, colname),
                 None,
-                result_map.get(
-                    colname,
-                    typemap.get(coltype, sqltypes.NULLTYPE))
+                map_type.get(colname, typemap.get(coltype, sqltypes.NULLTYPE))
             )
 
             processor = type_._cached_result_processor(dialect, coltype)
@@ -150,7 +145,7 @@ def __init__(self, result_proxy, metadata):
                 # unambiguous.
                 primary_keymap[name] = rec = (None, obj, None)
 
-            self.keys.append(colname)
+            self.keys.append(name)
             if obj:
                 for o in obj:
                     keymap[o] = rec
@@ -163,6 +158,18 @@ def __init__(self, result_proxy, metadata):
         # high precedence keymap.
         keymap.update(primary_keymap)
 
+    def result_map(self, data_map):
+        data_map = data_map or {}
+        map_type = {}
+        map_column_name = {}
+        for elem in data_map:
+            name = elem[0]
+            priority_name = getattr(elem[2][0], 'key', name)
+            map_type[name] = elem[3]  # type column
+            map_column_name[name] = priority_name
+
+        return map_type, map_column_name
+
     def _key_fallback(self, key, raiseerr=True):
         map = self._keymap
         result = None
@@ -175,9 +182,9 @@ def _key_fallback(self, key, raiseerr=True):
         elif isinstance(key, expression.ColumnElement):
             if (key._label and key._label in map):
                 result = map[key._label]
-            elif (hasattr(key, 'name') and key.name in map):
+            elif (hasattr(key, 'key') and key.key in map):
                 # match is only on name.
-                result = map[key.name]
+                result = map[key.key]
             # search extra hard to make sure this
             # isn't a column/label name overlap.
             # this check isn't currently available if the row

tests/pep492/test_sa_priority_name.py

@@ -0,0 +1,67 @@
+import pytest
+import sqlalchemy as sa
+
+meta = sa.MetaData()
+tbl = sa.Table(
+    'sa_tbl5', meta,
+    sa.Column('ID', sa.String, primary_key=True, key='id'),
+    sa.Column('Name', sa.String(255), key='name'),
+)
+
+
+@pytest.fixture
+def connect(make_sa_connection, loop):
+    async def start():
+        conn = await make_sa_connection()
+        await conn.execute('DROP TABLE IF EXISTS sa_tbl5')
+        await conn.execute(
+            'CREATE TABLE sa_tbl5 ('
+            '"ID" VARCHAR(255) NOT NULL, '
+            '"Name" VARCHAR(255), '
+            'PRIMARY KEY ("ID"))'
+        )
+
+        return conn
+
+    return loop.run_until_complete(start())
+
+
+async def test_priority_name(connect):
+    await connect.execute(tbl.insert().values(id='test_id', name='test_name'))
+    row = await (await connect.execute(tbl.select())).fetchone()
+    assert row.name == 'test_name'
+    assert row.id == 'test_id'
+
+
+async def test_priority_name_label(connect):
+    await connect.execute(tbl.insert().values(id='test_id', name='test_name'))
+    query = sa.select(
+        [tbl.c.name.label('test_label_name'), tbl.c.id]
+    )
+    query = query.select_from(tbl)
+    row = await (await connect.execute(query)).fetchone()
+    assert row.test_label_name == 'test_name'
+    assert row.id == 'test_id'
+
+
+async def test_priority_name_and_label(connect):
+    await connect.execute(tbl.insert().values(id='test_id', name='test_name'))
+    query = sa.select(
+        [tbl.c.name.label('test_label_name'), tbl.c.name, tbl.c.id]
+    )
+    query = query.select_from(tbl)
+    row = await (await connect.execute(query)).fetchone()
+    assert row.test_label_name == 'test_name'
+    assert row.name == 'test_name'
+    assert row.id == 'test_id'
+
+
+async def test_priority_name_all_get(connect):
+    await connect.execute(tbl.insert().values(id='test_id', name='test_name'))
+    query = sa.select([tbl.c.name])
+    query = query.select_from(tbl)
+    row = await (await connect.execute(query)).fetchone()
+    assert row.name == 'test_name'
+    assert row['name'] == 'test_name'
+    assert row[0] == 'test_name'
+    assert row[tbl.c.name] == 'test_name'