(tentative) add support for sqlalchemy 2.0.10

databases/backends/aiopg.py

@@ -7,11 +7,10 @@
 import aiopg
 from sqlalchemy.engine.cursor import CursorResultMetaData
 from sqlalchemy.engine.interfaces import Dialect, ExecutionContext
-from sqlalchemy.engine.row import Row
 from sqlalchemy.sql import ClauseElement
 from sqlalchemy.sql.ddl import DDLElement
 
-from databases.backends.common.records import Record, Row, create_column_maps
+from databases.backends.common.records import Record, create_column_maps, make_row
 from databases.backends.compilers.psycopg import PGCompiler_psycopg
 from databases.backends.dialects.psycopg import PGDialect_psycopg
 from databases.core import LOG_EXTRA, DatabaseURL
@@ -130,11 +129,8 @@ async def fetch_all(self, query: ClauseElement) -> typing.List[RecordInterface]:
             rows = await cursor.fetchall()
             metadata = CursorResultMetaData(context, cursor.description)
             rows = [
-                Row(
+                make_row(
                     metadata,
-                    metadata._processors,
-                    metadata._keymap,
-                    Row._default_key_style,
                     row,
                 )
                 for row in rows
@@ -155,11 +151,8 @@ async def fetch_one(self, query: ClauseElement) -> typing.Optional[RecordInterfa
             if row is None:
                 return None
             metadata = CursorResultMetaData(context, cursor.description)
-            row = Row(
+            row = make_row(
                 metadata,
-                metadata._processors,
-                metadata._keymap,
-                Row._default_key_style,
                 row,
             )
             return Record(row, result_columns, dialect, column_maps)
@@ -198,11 +191,8 @@ async def iterate(
             await cursor.execute(query_str, args)
             metadata = CursorResultMetaData(context, cursor.description)
             async for row in cursor:
-                record = Row(
+                record = make_row(
                     metadata,
-                    metadata._processors,
-                    metadata._keymap,
-                    Row._default_key_style,
                     row,
                 )
                 yield Record(record, result_columns, dialect, column_maps)

databases/backends/asyncmy.py

@@ -10,7 +10,7 @@
 from sqlalchemy.sql import ClauseElement
 from sqlalchemy.sql.ddl import DDLElement
 
-from databases.backends.common.records import Record, Row, create_column_maps
+from databases.backends.common.records import Record, create_column_maps, make_row
 from databases.core import LOG_EXTRA, DatabaseURL
 from databases.interfaces import (
     ConnectionBackend,
@@ -117,11 +117,8 @@ async def fetch_all(self, query: ClauseElement) -> typing.List[RecordInterface]:
                 rows = await cursor.fetchall()
                 metadata = CursorResultMetaData(context, cursor.description)
                 rows = [
-                    Row(
+                    make_row(
                         metadata,
-                        metadata._processors,
-                        metadata._keymap,
-                        Row._default_key_style,
                         row,
                     )
                     for row in rows
@@ -144,11 +141,8 @@ async def fetch_one(self, query: ClauseElement) -> typing.Optional[RecordInterfa
                 if row is None:
                     return None
                 metadata = CursorResultMetaData(context, cursor.description)
-                row = Row(
+                row = make_row(
                     metadata,
-                    metadata._processors,
-                    metadata._keymap,
-                    Row._default_key_style,
                     row,
                 )
                 return Record(row, result_columns, dialect, column_maps)
@@ -189,11 +183,8 @@ async def iterate(
                 await cursor.execute(query_str, args)
                 metadata = CursorResultMetaData(context, cursor.description)
                 async for row in cursor:
-                    record = Row(
+                    record = make_row(
                         metadata,
-                        metadata._processors,
-                        metadata._keymap,
-                        Row._default_key_style,
                         row,
                     )
                     yield Record(record, result_columns, dialect, column_maps)

databases/backends/common/records.py

@@ -1,7 +1,9 @@
 import json
 import typing
 from datetime import date, datetime
+from packaging import version
 
+from sqlalchemy import __version__ as sqlalchemy_version
 from sqlalchemy.engine.interfaces import Dialect
 from sqlalchemy.engine.row import Row as SQLRow
 from sqlalchemy.sql.compiler import _CompileLabel
@@ -84,6 +86,7 @@ def __getattr__(self, name: str) -> typing.Any:
 
 
 class Row(SQLRow):
+
     def __getitem__(self, key: typing.Any) -> typing.Any:
         """
         An instance of a Row in SQLAlchemy allows the access
@@ -140,3 +143,25 @@ def create_column_maps(
         else:
             column_map_full[str(column[0])] = (idx, datatype)
     return column_map, column_map_int, column_map_full
+
+
+if version.parse(sqlalchemy_version) >= version.parse("2.0.10"):
+
+    def make_row(metadata, row):
+        return Row(
+            metadata,
+            metadata._effective_processors,
+            metadata._key_to_index,
+            row,
+        )
+
+else:
+
+    def make_row(metadata, row):
+        return Row(
+            metadata,
+            metadata._processors,
+            metadata._keymap,
+            Row._default_key_style,
+            row,
+        )

databases/backends/mysql.py

@@ -10,7 +10,7 @@
 from sqlalchemy.sql import ClauseElement
 from sqlalchemy.sql.ddl import DDLElement
 
-from databases.backends.common.records import Record, Row, create_column_maps
+from databases.backends.common.records import Record, create_column_maps, make_row
 from databases.core import LOG_EXTRA, DatabaseURL
 from databases.interfaces import (
     ConnectionBackend,
@@ -116,11 +116,8 @@ async def fetch_all(self, query: ClauseElement) -> typing.List[RecordInterface]:
             rows = await cursor.fetchall()
             metadata = CursorResultMetaData(context, cursor.description)
             rows = [
-                Row(
+                make_row(
                     metadata,
-                    metadata._processors,
-                    metadata._keymap,
-                    Row._default_key_style,
                     row,
                 )
                 for row in rows
@@ -141,11 +138,8 @@ async def fetch_one(self, query: ClauseElement) -> typing.Optional[RecordInterfa
             if row is None:
                 return None
             metadata = CursorResultMetaData(context, cursor.description)
-            row = Row(
+            row = make_row(
                 metadata,
-                metadata._processors,
-                metadata._keymap,
-                Row._default_key_style,
                 row,
             )
             return Record(row, result_columns, dialect, column_maps)
@@ -186,11 +180,8 @@ async def iterate(
             await cursor.execute(query_str, args)
             metadata = CursorResultMetaData(context, cursor.description)
             async for row in cursor:
-                record = Row(
+                record = make_row(
                     metadata,
-                    metadata._processors,
-                    metadata._keymap,
-                    Row._default_key_style,
                     row,
                 )
                 yield Record(record, result_columns, dialect, column_maps)

databases/backends/sqlite.py

@@ -9,7 +9,7 @@
 from sqlalchemy.sql import ClauseElement
 from sqlalchemy.sql.ddl import DDLElement
 
-from databases.backends.common.records import Record, Row, create_column_maps
+from databases.backends.common.records import Record, create_column_maps, make_row
 from databases.core import LOG_EXTRA, DatabaseURL
 from databases.interfaces import ConnectionBackend, DatabaseBackend, TransactionBackend
 
@@ -82,16 +82,7 @@ async def fetch_all(self, query: ClauseElement) -> typing.List[Record]:
         async with self._connection.execute(query_str, args) as cursor:
             rows = await cursor.fetchall()
             metadata = CursorResultMetaData(context, cursor.description)
-            rows = [
-                Row(
-                    metadata,
-                    metadata._processors,
-                    metadata._keymap,
-                    Row._default_key_style,
-                    row,
-                )
-                for row in rows
-            ]
+            rows = [make_row(metadata, row) for row in rows]
             return [Record(row, result_columns, dialect, column_maps) for row in rows]
 
     async def fetch_one(self, query: ClauseElement) -> typing.Optional[Record]:
@@ -105,11 +96,8 @@ async def fetch_one(self, query: ClauseElement) -> typing.Optional[Record]:
             if row is None:
                 return None
             metadata = CursorResultMetaData(context, cursor.description)
-            row = Row(
+            row = make_row(
                 metadata,
-                metadata._processors,
-                metadata._keymap,
-                Row._default_key_style,
                 row,
             )
             return Record(row, result_columns, dialect, column_maps)
@@ -139,11 +127,8 @@ async def iterate(
         async with self._connection.execute(query_str, args) as cursor:
             metadata = CursorResultMetaData(context, cursor.description)
             async for row in cursor:
-                record = Row(
+                record = make_row(
                     metadata,
-                    metadata._processors,
-                    metadata._keymap,
-                    Row._default_key_style,
                     row,
                 )
                 yield Record(record, result_columns, dialect, column_maps)