From 7b2c6e6b4cb1aeb72ae49acf6f698062458f45c9 Mon Sep 17 00:00:00 2001 From: Shamil Abdulaev Date: Thu, 17 Apr 2025 17:43:25 +0300 Subject: [PATCH] refactor: simplify and clean up dialect-specific code Removed unused variables and redundant functions across multiple dialects. Improves code readability and reduces maintenance complexity without altering functionality. --- lib/sqlalchemy/dialects/mssql/base.py | 12 ++++-------- lib/sqlalchemy/dialects/mysql/base.py | 1 - .../dialects/postgresql/_psycopg_common.py | 1 - lib/sqlalchemy/dialects/postgresql/base.py | 1 - lib/sqlalchemy/dialects/sqlite/provision.py | 2 -- 5 files changed, 4 insertions(+), 13 deletions(-) diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py index 24425fc817..937eedf9c3 100644 --- a/lib/sqlalchemy/dialects/mssql/base.py +++ b/lib/sqlalchemy/dialects/mssql/base.py @@ -1324,7 +1324,7 @@ class _BASETIMEIMPL(TIME): class _DateTimeBase: - def bind_processor(self, dialect): + def bind_processor(self): def process(value): if type(value) == datetime.date: return datetime.datetime(value.year, value.month, value.day) @@ -3949,11 +3949,8 @@ index_info AS ( ) ) - # group rows by constraint ID, to handle multi-column FKs - fkeys = [] - - def fkey_rec(): - return { + fkeys = util.defaultdict( + lambda: { "name": None, "constrained_columns": [], "referred_schema": None, @@ -3961,8 +3958,7 @@ index_info AS ( "referred_columns": [], "options": {}, } - - fkeys = util.defaultdict(fkey_rec) + ) for r in connection.execute(s).all(): ( diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py index c3bf5fee3b..2951b17d3b 100644 --- a/lib/sqlalchemy/dialects/mysql/base.py +++ b/lib/sqlalchemy/dialects/mysql/base.py @@ -3486,7 +3486,6 @@ class MySQLDialect(default.DefaultDialect): full_name = self.identifier_preparer.format_table(table) st = "SHOW CREATE TABLE %s" % full_name - rp = None try: rp = connection.execution_options( skip_user_error_events=True diff --git a/lib/sqlalchemy/dialects/postgresql/_psycopg_common.py b/lib/sqlalchemy/dialects/postgresql/_psycopg_common.py index e5b39e5004..e5a8867c21 100644 --- a/lib/sqlalchemy/dialects/postgresql/_psycopg_common.py +++ b/lib/sqlalchemy/dialects/postgresql/_psycopg_common.py @@ -175,7 +175,6 @@ class _PGDialect_common_psycopg(PGDialect): connection.autocommit = value def do_ping(self, dbapi_connection): - cursor = None before_autocommit = dbapi_connection.autocommit if not before_autocommit: diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py index 864445026b..2966d3e7fd 100644 --- a/lib/sqlalchemy/dialects/postgresql/base.py +++ b/lib/sqlalchemy/dialects/postgresql/base.py @@ -3938,7 +3938,6 @@ class PGDialect(default.DefaultDialect): schema_type = ENUM enum = enums[enum_or_domain_key] - args = tuple(enum["labels"]) kwargs["name"] = enum["name"] if not enum["visible"]: diff --git a/lib/sqlalchemy/dialects/sqlite/provision.py b/lib/sqlalchemy/dialects/sqlite/provision.py index 97f882e7f2..e1df005e72 100644 --- a/lib/sqlalchemy/dialects/sqlite/provision.py +++ b/lib/sqlalchemy/dialects/sqlite/provision.py @@ -52,8 +52,6 @@ def _format_url(url, driver, ident): assert "test_schema" not in filename tokens = re.split(r"[_\.]", filename) - new_filename = f"{driver}" - for token in tokens: if token in _drivernames: if driver is None: -- 2.47.3