Drop result_map

aio-libs · Apr 20, 2015 · fafe40a · fafe40a
1 parent 14fe9e5
commit fafe40a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 15 deletions.
diff --git a/aiomysql/sa/connection.py b/aiomysql/sa/connection.py
@@ -68,7 +68,6 @@ def execute(self, query, *multiparams, **params):
             dp = dp[0]
 
         if isinstance(query, str):
-            result_map = None
             yield from cursor.execute(query, dp)
         elif isinstance(query, ClauseElement):
             compiled = query.compile(dialect=self._dialect)
@@ -94,20 +93,18 @@ def execute(self, query, *multiparams, **params):
                     processed_parameters.append(params)
                 post_processed_params = self._dialect.execute_sequence_format(
                     processed_parameters)
-                result_map = compiled.result_map
             else:
                 if dp:
                     raise exc.ArgumentError("Don't mix sqlalchemy DDL clause "
                                             "and execution with parameters")
                 post_processed_params = [compiled.construct_params()]
-                result_map = None
             yield from cursor.execute(str(compiled), post_processed_params[0])
         else:
             raise exc.ArgumentError("sql statement should be str or "
                                     "SQLAlchemy data "
                                     "selection/modification clause")
 
-        ret = ResultProxy(self, cursor, self._dialect, result_map)
+        ret = ResultProxy(self, cursor, self._dialect)
         self._weak_results.add(ret)
         return ret
 

diff --git a/aiomysql/sa/result.py b/aiomysql/sa/result.py
@@ -114,15 +114,8 @@ def __init__(self, result_proxy, metadata):
             # if dialect.requires_name_normalize:
             #     colname = dialect.normalize_name(colname)
 
-            if result_proxy._result_map:
-                try:
-                    name, obj, type_ = result_proxy._result_map[colname]
-                except KeyError:
-                    name, obj, type_ = \
-                        colname, None, typemap.get(coltype, sqltypes.NULLTYPE)
-            else:
-                name, obj, type_ = \
-                    colname, None, typemap.get(coltype, sqltypes.NULLTYPE)
+            name, obj, type_ = \
+                colname, None, typemap.get(coltype, sqltypes.NULLTYPE)
 
             processor = type_._cached_result_processor(dialect, coltype)
 
@@ -220,12 +213,11 @@ class ResultProxy:
     the originating SQL statement that produced this result set.
     """
 
-    def __init__(self, connection, cursor, dialect, result_map):
+    def __init__(self, connection, cursor, dialect):
         self._dialect = dialect
         self._closed = False
         self._cursor = cursor
         self._connection = connection
-        self._result_map = result_map
         self._rowcount = cursor.rowcount
         self._lastrowid = cursor.lastrowid