S01E05

Author: ansipunk

databases/backends/common/records.py

@@ -4,7 +4,6 @@
 from sqlalchemy.engine.row import Row as SQLRow
 from sqlalchemy.sql.compiler import _CompileLabel
 from sqlalchemy.sql.schema import Column
-from sqlalchemy.sql.sqltypes import JSON
 from sqlalchemy.types import TypeEngine
 
 from databases.interfaces import Record as RecordInterface

databases/backends/psycopg.py

@@ -2,6 +2,7 @@
 
 import psycopg
 import psycopg_pool
+from psycopg.rows import namedtuple_row
 from sqlalchemy.engine.interfaces import Dialect
 from sqlalchemy.dialects.postgresql.psycopg import PGDialect_psycopg
 from sqlalchemy.sql import ClauseElement
@@ -58,12 +59,11 @@ def connection(self) -> "PsycopgConnection":
 class PsycopgConnection(ConnectionBackend):
     _database: PsycopgBackend
     _dialect: Dialect
-    _connection: typing.Optional[psycopg.AsyncConnection]
+    _connection: typing.Optional[psycopg.AsyncConnection] = None
 
     def __init__(self, database: PsycopgBackend, dialect: Dialect) -> None:
         self._database = database
         self._dialect = dialect
-        self._connection = None
 
     async def acquire(self) -> None:
         if self._connection is not None:
@@ -74,6 +74,7 @@ async def acquire(self) -> None:
 
         # TODO: Add configurable timeouts
         self._connection = await self._database._pool.getconn()
+        await self._connection.set_autocommit(True)
 
     async def release(self) -> None:
         if self._connection is None:
@@ -88,7 +89,7 @@ async def fetch_all(self, query: ClauseElement) -> typing.List[RecordInterface]:
 
         query_str, args, result_columns = self._compile(query)
 
-        async with self._connection.cursor() as cursor:
+        async with self._connection.cursor(row_factory=namedtuple_row) as cursor:
             await cursor.execute(query_str, args)
             rows = await cursor.fetchall()
 
@@ -101,7 +102,7 @@ async def fetch_one(self, query: ClauseElement) -> typing.Optional[RecordInterfa
 
         query_str, args, result_columns = self._compile(query)
 
-        async with self._connection.cursor() as cursor:
+        async with self._connection.cursor(row_factory=namedtuple_row) as cursor:
             await cursor.execute(query_str, args)
             row = await cursor.fetchone()
 
@@ -127,7 +128,7 @@ async def execute(self, query: ClauseElement) -> typing.Any:
 
         query_str, args, _ = self._compile(query)
 
-        async with self._connection.cursor() as cursor:
+        async with self._connection.cursor(row_factory=namedtuple_row) as cursor:
             await cursor.execute(query_str, args)
 
     async def execute_many(self, queries: typing.List[ClauseElement]) -> None:
@@ -144,7 +145,7 @@ async def iterate(
         query_str, args, result_columns = self._compile(query)
         column_maps = create_column_maps(result_columns)
 
-        async with self._connection.cursor() as cursor:
+        async with self._connection.cursor(row_factory=namedtuple_row) as cursor:
             await cursor.execute(query_str, args)
 
             while True: