diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2023-04-21 15:28:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@bbpush.zzzcomputing.com> | 2023-04-21 15:28:43 +0000 |
| commit | 95628d9707cdfbfdd229b2acee02fbadfbe7ced0 (patch) | |
| tree | c8b17287a05a074f2c0081772b829b2f6c046140 /lib/sqlalchemy/orm/persistence.py | |
| parent | 98b77c36ed90894a4f7d4b9b43b8903675f36717 (diff) | |
| parent | 63f51491c5f0cb22883c800a065d7c4b4c54774e (diff) | |
| download | sqlalchemy-95628d9707cdfbfdd229b2acee02fbadfbe7ced0.tar.gz | |
Merge "try to omit unnecessary cols for ORM bulk insert + returning" into main
Diffstat (limited to 'lib/sqlalchemy/orm/persistence.py')
| -rw-r--r-- | lib/sqlalchemy/orm/persistence.py | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/lib/sqlalchemy/orm/persistence.py b/lib/sqlalchemy/orm/persistence.py index a331d4ed8..a12156eb5 100644 --- a/lib/sqlalchemy/orm/persistence.py +++ b/lib/sqlalchemy/orm/persistence.py @@ -1076,12 +1076,16 @@ def _emit_insert_statements( else: do_executemany = False - if not has_all_defaults and base_mapper._prefer_eager_defaults( - connection.dialect, table - ): - statement = statement.return_defaults( - *mapper._server_default_cols[table] - ) + if use_orm_insert_stmt is None: + if ( + not has_all_defaults + and base_mapper._prefer_eager_defaults( + connection.dialect, table + ) + ): + statement = statement.return_defaults( + *mapper._server_default_cols[table] + ) if mapper.version_id_col is not None: statement = statement.return_defaults(mapper.version_id_col) |