From: Mingyu Park Date: Fri, 31 Jan 2025 13:55:22 +0000 (+0900) Subject: Convention: Remove import `orm` and Use `coercions.expect_as_key` X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d650bb7e373d208e694fa932e4f750df2efab98;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git Convention: Remove import `orm` and Use `coercions.expect_as_key` --- diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py index 79c3d0982f..af546cdcd8 100644 --- a/lib/sqlalchemy/dialects/mysql/base.py +++ b/lib/sqlalchemy/dialects/mysql/base.py @@ -1097,7 +1097,6 @@ from ...engine import cursor as _cursor from ...engine import default from ...engine import reflection from ...engine.reflection import ReflectionDefaults -from ...orm.attributes import InstrumentedAttribute from ...sql import coercions from ...sql import compiler from ...sql import elements @@ -1403,7 +1402,7 @@ class MySQLCompiler(compiler.SQLCompiler): _on_dup_alias_name = "new" on_duplicate_update = { - (key.key if isinstance(key, InstrumentedAttribute) else key): value + coercions.expect_as_key(roles.DMLColumnRole, key): value for key, value in on_duplicate.update.items() }