Merge "Run row value processors up front"

2 files changed, 6 insertions, 6 deletions

diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py
index 13012a4f2..73484aea1 100644
--- a/lib/sqlalchemy/dialects/mysql/base.py
+++ b/lib/sqlalchemy/dialects/mysql/base.py
@@ -2309,7 +2309,7 @@ class MySQLDialect(default.DefaultDialect):
         """Proxy result rows to smooth over MySQL-Python driver
         inconsistencies."""
 
-        return [_DecodingRowProxy(row, charset) for row in rp.fetchall()]
+        return [_DecodingRow(row, charset) for row in rp.fetchall()]
 
     def _compat_fetchone(self, rp, charset=None):
         """Proxy a result row to smooth over MySQL-Python driver
@@ -2317,7 +2317,7 @@ class MySQLDialect(default.DefaultDialect):
 
         row = rp.fetchone()
         if row:
-            return _DecodingRowProxy(row, charset)
+            return _DecodingRow(row, charset)
         else:
             return None
 
@@ -2327,7 +2327,7 @@ class MySQLDialect(default.DefaultDialect):
 
         row = rp.first()
         if row:
-            return _DecodingRowProxy(row, charset)
+            return _DecodingRow(row, charset)
         else:
             return None
 
@@ -2916,7 +2916,7 @@ class MySQLDialect(default.DefaultDialect):
         return rows
 
 
-class _DecodingRowProxy(object):
+class _DecodingRow(object):
     """Return unicode-decoded values based on type inspection.
 
     Smooth over data type issues (esp. with alpha driver versions) and
diff --git a/lib/sqlalchemy/dialects/sqlite/base.py b/lib/sqlalchemy/dialects/sqlite/base.py
index 7be0e06dc..defb64ec0 100644
--- a/lib/sqlalchemy/dialects/sqlite/base.py
+++ b/lib/sqlalchemy/dialects/sqlite/base.py
@@ -546,10 +546,10 @@ names are still addressable*::
     1
 
 Therefore, the workaround applied by SQLAlchemy only impacts
-:meth:`.ResultProxy.keys` and :meth:`.RowProxy.keys()` in the public API. In
+:meth:`.ResultProxy.keys` and :meth:`.Row.keys()` in the public API. In
 the very specific case where an application is forced to use column names that
 contain dots, and the functionality of :meth:`.ResultProxy.keys` and
-:meth:`.RowProxy.keys()` is required to return these dotted names unmodified,
+:meth:`.Row.keys()` is required to return these dotted names unmodified,
 the ``sqlite_raw_colnames`` execution option may be provided, either on a
 per-:class:`.Connection` basis::