From: Caspar Wylie Date: Thu, 2 Feb 2023 09:28:43 +0000 (+0000) Subject: Run pre-commit hooks! X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=409c6610219cea333ec76175dc480759828afa72;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git Run pre-commit hooks! --- diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py index d0126dfd45..8949d4abf2 100644 --- a/lib/sqlalchemy/dialects/mysql/base.py +++ b/lib/sqlalchemy/dialects/mysql/base.py @@ -1336,17 +1336,18 @@ class MySQLCompiler(compiler.SQLCompiler): obj.type = column.type return obj elif ( - isinstance(obj, elements.ColumnClause) - and obj.table is on_duplicate.inserted_alias + isinstance(obj, elements.ColumnClause) + and obj.table is on_duplicate.inserted_alias ): if not alias_clause: - alias_clause = f"AS {ON_DUP_ALIAS_NAME} " + alias_clause = f"AS {ON_DUP_ALIAS_NAME} " return literal_column( - f"{ON_DUP_ALIAS_NAME}.{self.preparer.quote(obj.name)}" + f"{ON_DUP_ALIAS_NAME}." + + self.preparer.quote(obj.name) ) else: - # element is not replaced - return None + # element is not replaced + return None val = visitors.replacement_traverse(val, {}, replace) value_text = self.process(val.self_group(), use_schema=False) diff --git a/test/dialect/mysql/test_compiler.py b/test/dialect/mysql/test_compiler.py index 9e03672eba..1184c9e1b4 100644 --- a/test/dialect/mysql/test_compiler.py +++ b/test/dialect/mysql/test_compiler.py @@ -1149,7 +1149,8 @@ class InsertOnDuplicateTest(fixtures.TestBase, AssertsCompiledSQL): "INSERT INTO foos (id, bar) VALUES (%s, %s), (%s, %s) " f"AS {mysql.ON_DUP_ALIAS_NAME} ON DUPLICATE KEY UPDATE bar = " f"coalesce({mysql.ON_DUP_ALIAS_NAME}.bar), " - f"baz = (concat({mysql.ON_DUP_ALIAS_NAME}.baz, %s, {mysql.ON_DUP_ALIAS_NAME}.bar))" + f"baz = (concat({mysql.ON_DUP_ALIAS_NAME}.baz, %s, " + f"{mysql.ON_DUP_ALIAS_NAME}.bar))" ) self.assert_compile( stmt, @@ -1163,6 +1164,7 @@ class InsertOnDuplicateTest(fixtures.TestBase, AssertsCompiledSQL): }, ) + class RegexpCommon(testing.AssertsCompiledSQL): def setup_test(self): self.table = table( diff --git a/test/ext/mypy/plugin_files/issue_9156.py b/test/ext/mypy/plugin_files/issue_9156.py index 46e5e95703..e67f64442a 100644 --- a/test/ext/mypy/plugin_files/issue_9156.py +++ b/test/ext/mypy/plugin_files/issue_9156.py @@ -1,4 +1,5 @@ -from typing import Any, Type +from typing import Any +from typing import Type from sqlalchemy.sql.elements import ColumnElement from sqlalchemy.sql.type_api import TypeEngine