summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/dialects
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/dialects')
-rw-r--r--lib/sqlalchemy/dialects/mysql/aiomysql.py8
-rw-r--r--lib/sqlalchemy/dialects/mysql/asyncmy.py6
-rw-r--r--lib/sqlalchemy/dialects/mysql/base.py4
-rw-r--r--lib/sqlalchemy/dialects/oracle/cx_oracle.py4
-rw-r--r--lib/sqlalchemy/dialects/postgresql/asyncpg.py6
-rw-r--r--lib/sqlalchemy/dialects/postgresql/pg8000.py8
-rw-r--r--lib/sqlalchemy/dialects/postgresql/psycopg2.py4
-rw-r--r--lib/sqlalchemy/dialects/sqlite/aiosqlite.py6
-rw-r--r--lib/sqlalchemy/dialects/sqlite/pysqlite.py8
9 files changed, 35 insertions, 19 deletions
diff --git a/lib/sqlalchemy/dialects/mysql/aiomysql.py b/lib/sqlalchemy/dialects/mysql/aiomysql.py
index c9a87145e..c5ba635c2 100644
--- a/lib/sqlalchemy/dialects/mysql/aiomysql.py
+++ b/lib/sqlalchemy/dialects/mysql/aiomysql.py
@@ -13,7 +13,7 @@ r"""
.. warning:: The aiomysql dialect as of September, 2021 appears to be unmaintained
and no longer functions for Python version 3.10. Please refer to the
- :ref:`asyncmy` dialect for current MySQL asyncio functionality.
+ :ref:`asyncmy` dialect for current MySQL/MariaDD asyncio functionality.
The aiomysql dialect is SQLAlchemy's second Python asyncio dialect.
@@ -33,6 +33,7 @@ This dialect should normally be used only with the
from .pymysql import MySQLDialect_pymysql
from ... import pool
from ... import util
+from ...engine import AdaptedConnection
from ...util.concurrency import asyncio
from ...util.concurrency import await_fallback
from ...util.concurrency import await_only
@@ -173,7 +174,7 @@ class AsyncAdapt_aiomysql_ss_cursor(AsyncAdapt_aiomysql_cursor):
return self.await_(self._cursor.fetchall())
-class AsyncAdapt_aiomysql_connection:
+class AsyncAdapt_aiomysql_connection(AdaptedConnection):
await_ = staticmethod(await_only)
__slots__ = ("dbapi", "_connection", "_execute_mutex")
@@ -306,5 +307,8 @@ class MySQLDialect_aiomysql(MySQLDialect_pymysql):
return CLIENT.FOUND_ROWS
+ def get_driver_connection(self, connection):
+ return connection._connection
+
dialect = MySQLDialect_aiomysql
diff --git a/lib/sqlalchemy/dialects/mysql/asyncmy.py b/lib/sqlalchemy/dialects/mysql/asyncmy.py
index badf6e389..0fca338f5 100644
--- a/lib/sqlalchemy/dialects/mysql/asyncmy.py
+++ b/lib/sqlalchemy/dialects/mysql/asyncmy.py
@@ -31,6 +31,7 @@ This dialect should normally be used only with the
from .pymysql import MySQLDialect_pymysql
from ... import pool
from ... import util
+from ...engine import AdaptedConnection
from ...util.concurrency import asynccontextmanager
from ...util.concurrency import asyncio
from ...util.concurrency import await_fallback
@@ -171,7 +172,7 @@ class AsyncAdapt_asyncmy_ss_cursor(AsyncAdapt_asyncmy_cursor):
return self.await_(self._cursor.fetchall())
-class AsyncAdapt_asyncmy_connection:
+class AsyncAdapt_asyncmy_connection(AdaptedConnection):
await_ = staticmethod(await_only)
__slots__ = ("dbapi", "_connection", "_execute_mutex")
@@ -321,5 +322,8 @@ class MySQLDialect_asyncmy(MySQLDialect_pymysql):
return CLIENT.FOUND_ROWS
+ def get_driver_connection(self, connection):
+ return connection._connection
+
dialect = MySQLDialect_asyncmy
diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py
index 04b0c1b6d..2bba2f81a 100644
--- a/lib/sqlalchemy/dialects/mysql/base.py
+++ b/lib/sqlalchemy/dialects/mysql/base.py
@@ -2687,8 +2687,8 @@ class MySQLDialect(default.DefaultDialect):
# adjust for ConnectionFairy being present
# allows attribute set e.g. "connection.autocommit = True"
# to work properly
- if hasattr(connection, "connection"):
- connection = connection.connection
+ if hasattr(connection, "dbapi_connection"):
+ connection = connection.dbapi_connection
self._set_isolation_level(connection, level)
diff --git a/lib/sqlalchemy/dialects/oracle/cx_oracle.py b/lib/sqlalchemy/dialects/oracle/cx_oracle.py
index aab2018bf..3e705dced 100644
--- a/lib/sqlalchemy/dialects/oracle/cx_oracle.py
+++ b/lib/sqlalchemy/dialects/oracle/cx_oracle.py
@@ -1085,8 +1085,8 @@ class OracleDialect_cx_oracle(OracleDialect):
return result
def set_isolation_level(self, connection, level):
- if hasattr(connection, "connection"):
- dbapi_connection = connection.connection
+ if hasattr(connection, "dbapi_connection"):
+ dbapi_connection = connection.dbapi_connection
else:
dbapi_connection = connection
if level == "AUTOCOMMIT":
diff --git a/lib/sqlalchemy/dialects/postgresql/asyncpg.py b/lib/sqlalchemy/dialects/postgresql/asyncpg.py
index 825558f26..dc3da224c 100644
--- a/lib/sqlalchemy/dialects/postgresql/asyncpg.py
+++ b/lib/sqlalchemy/dialects/postgresql/asyncpg.py
@@ -121,6 +121,7 @@ from ... import exc
from ... import pool
from ... import processors
from ... import util
+from ...engine import AdaptedConnection
from ...sql import sqltypes
from ...util.concurrency import asyncio
from ...util.concurrency import await_fallback
@@ -566,7 +567,7 @@ class AsyncAdapt_asyncpg_ss_cursor(AsyncAdapt_asyncpg_cursor):
)
-class AsyncAdapt_asyncpg_connection:
+class AsyncAdapt_asyncpg_connection(AdaptedConnection):
__slots__ = (
"dbapi",
"_connection",
@@ -1045,5 +1046,8 @@ class PGDialect_asyncpg(PGDialect):
return connect
+ def get_driver_connection(self, connection):
+ return connection._connection
+
dialect = PGDialect_asyncpg
diff --git a/lib/sqlalchemy/dialects/postgresql/pg8000.py b/lib/sqlalchemy/dialects/postgresql/pg8000.py
index 3d1051b7d..d42dd9560 100644
--- a/lib/sqlalchemy/dialects/postgresql/pg8000.py
+++ b/lib/sqlalchemy/dialects/postgresql/pg8000.py
@@ -433,8 +433,8 @@ class PGDialect_pg8000(PGDialect):
level = level.replace("_", " ")
# adjust for ConnectionFairy possibly being present
- if hasattr(connection, "connection"):
- connection = connection.connection
+ if hasattr(connection, "dbapi_connection"):
+ connection = connection.dbapi_connection
if level == "AUTOCOMMIT":
connection.autocommit = True
@@ -498,8 +498,8 @@ class PGDialect_pg8000(PGDialect):
def set_client_encoding(self, connection, client_encoding):
# adjust for ConnectionFairy possibly being present
- if hasattr(connection, "connection"):
- connection = connection.connection
+ if hasattr(connection, "dbapi_connection"):
+ connection = connection.dbapi_connection
cursor = connection.cursor()
cursor.execute("SET CLIENT_ENCODING TO '" + client_encoding + "'")
diff --git a/lib/sqlalchemy/dialects/postgresql/psycopg2.py b/lib/sqlalchemy/dialects/postgresql/psycopg2.py
index c80198825..a5a56cb6b 100644
--- a/lib/sqlalchemy/dialects/postgresql/psycopg2.py
+++ b/lib/sqlalchemy/dialects/postgresql/psycopg2.py
@@ -982,8 +982,8 @@ class PGDialect_psycopg2(PGDialect):
@util.memoized_instancemethod
def _hstore_oids(self, conn):
extras = self._psycopg2_extras()
- if hasattr(conn, "connection"):
- conn = conn.connection
+ if hasattr(conn, "dbapi_connection"):
+ conn = conn.dbapi_connection
oids = extras.HstoreAdapter.get_oids(conn)
if oids is not None and oids[0]:
return oids[0:2]
diff --git a/lib/sqlalchemy/dialects/sqlite/aiosqlite.py b/lib/sqlalchemy/dialects/sqlite/aiosqlite.py
index eb750b0e7..4319e2661 100644
--- a/lib/sqlalchemy/dialects/sqlite/aiosqlite.py
+++ b/lib/sqlalchemy/dialects/sqlite/aiosqlite.py
@@ -41,6 +41,7 @@ from .base import SQLiteExecutionContext
from .pysqlite import SQLiteDialect_pysqlite
from ... import pool
from ... import util
+from ...engine import AdaptedConnection
from ...util.concurrency import await_fallback
from ...util.concurrency import await_only
@@ -162,7 +163,7 @@ class AsyncAdapt_aiosqlite_ss_cursor(AsyncAdapt_aiosqlite_cursor):
return self.await_(self._cursor.fetchall())
-class AsyncAdapt_aiosqlite_connection:
+class AsyncAdapt_aiosqlite_connection(AdaptedConnection):
await_ = staticmethod(await_only)
__slots__ = ("dbapi", "_connection")
@@ -328,5 +329,8 @@ class SQLiteDialect_aiosqlite(SQLiteDialect_pysqlite):
return super().is_disconnect(e, connection, cursor)
+ def get_driver_connection(self, connection):
+ return connection._connection
+
dialect = SQLiteDialect_aiosqlite
diff --git a/lib/sqlalchemy/dialects/sqlite/pysqlite.py b/lib/sqlalchemy/dialects/sqlite/pysqlite.py
index 0f96e8830..e9d5d9682 100644
--- a/lib/sqlalchemy/dialects/sqlite/pysqlite.py
+++ b/lib/sqlalchemy/dialects/sqlite/pysqlite.py
@@ -499,8 +499,8 @@ class SQLiteDialect_pysqlite(SQLiteDialect):
)
def set_isolation_level(self, connection, level):
- if hasattr(connection, "connection"):
- dbapi_connection = connection.connection
+ if hasattr(connection, "dbapi_connection"):
+ dbapi_connection = connection.dbapi_connection
else:
dbapi_connection = connection
@@ -521,8 +521,8 @@ class SQLiteDialect_pysqlite(SQLiteDialect):
return re.search(a, b) is not None
def set_regexp(connection):
- if hasattr(connection, "connection"):
- dbapi_connection = connection.connection
+ if hasattr(connection, "dbapi_connection"):
+ dbapi_connection = connection.dbapi_connection
else:
dbapi_connection = connection
dbapi_connection.create_function(
View Lorry Controller Status