summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/persistence.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2023-04-21 09:48:04 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2023-04-21 10:24:41 -0400
commit63f51491c5f0cb22883c800a065d7c4b4c54774e (patch)
tree2df87528b08e0f41cc9350f3412fd199da22cf1f /lib/sqlalchemy/orm/persistence.py
parent0112b3e2dc15f115f4b560bfc761e00fe1d4de24 (diff)
downloadsqlalchemy-63f51491c5f0cb22883c800a065d7c4b4c54774e.tar.gz
try to omit unnecessary cols for ORM bulk insert + returning
Fixed bug in ORM bulk insert feature where additional unnecessary columns would be rendered in the INSERT statement if RETURNING of individual columns were requested. Fixes: #9685 Change-Id: Ibf5f06ab017215c7c9bd8850c3a006f73fe78c68
Diffstat (limited to 'lib/sqlalchemy/orm/persistence.py')
-rw-r--r--lib/sqlalchemy/orm/persistence.py16
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)