diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2023-04-21 16:51:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@bbpush.zzzcomputing.com> | 2023-04-21 16:51:19 +0000 |
| commit | c84b3bf198c75ad4f42b0f83d482e480200e6d16 (patch) | |
| tree | 86e991ad8f43515ec7948ff809f44bb7d8b301fa /lib/sqlalchemy/dialects/mysql/provision.py | |
| parent | 95628d9707cdfbfdd229b2acee02fbadfbe7ced0 (diff) | |
| parent | cf6872d3bdf1a8a9613e853694acc2b1e6f06f51 (diff) | |
| download | sqlalchemy-c84b3bf198c75ad4f42b0f83d482e480200e6d16.tar.gz | |
Merge "add deterministic imv returning ordering using sentinel columns" into main
Diffstat (limited to 'lib/sqlalchemy/dialects/mysql/provision.py')
| -rw-r--r-- | lib/sqlalchemy/dialects/mysql/provision.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/sqlalchemy/dialects/mysql/provision.py b/lib/sqlalchemy/dialects/mysql/provision.py index 36a5e9f54..b7faf7712 100644 --- a/lib/sqlalchemy/dialects/mysql/provision.py +++ b/lib/sqlalchemy/dialects/mysql/provision.py @@ -82,7 +82,9 @@ def _mysql_temp_table_keyword_args(cfg, eng): @upsert.for_db("mariadb") -def _upsert(cfg, table, returning, set_lambda=None): +def _upsert( + cfg, table, returning, *, set_lambda=None, sort_by_parameter_order=False +): from sqlalchemy.dialects.mysql import insert stmt = insert(table) @@ -93,5 +95,7 @@ def _upsert(cfg, table, returning, set_lambda=None): pk1 = table.primary_key.c[0] stmt = stmt.on_duplicate_key_update({pk1.key: pk1}) - stmt = stmt.returning(*returning) + stmt = stmt.returning( + *returning, sort_by_parameter_order=sort_by_parameter_order + ) return stmt |