summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/persistence.py
diff options
context:
space:
mode:
authortsauerwein <tobias.sauerwein@camptocamp.com>2016-02-20 17:20:50 +0100
committertsauerwein <tobias.sauerwein@camptocamp.com>2016-02-20 17:20:50 +0100
commit1b60340c63c84aa478988a285450fa4d5e2f7bd0 (patch)
treeb8eafca87cf55c2fd307759d7c0e7ea1093762d7 /lib/sqlalchemy/orm/persistence.py
parent60a9d2da25da68466130771afc3f35c9473aca02 (diff)
downloadsqlalchemy-pr/243.tar.gz
Add argument 'with_none' to Session.bulk_insert_mappingspr/243
Diffstat (limited to 'lib/sqlalchemy/orm/persistence.py')
-rw-r--r--lib/sqlalchemy/orm/persistence.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/sqlalchemy/orm/persistence.py b/lib/sqlalchemy/orm/persistence.py
index b9a1f9df9..01a75a6e6 100644
--- a/lib/sqlalchemy/orm/persistence.py
+++ b/lib/sqlalchemy/orm/persistence.py
@@ -25,7 +25,8 @@ from . import loading
def _bulk_insert(
- mapper, mappings, session_transaction, isstates, return_defaults):
+ mapper, mappings, session_transaction, isstates, return_defaults,
+ with_none):
base_mapper = mapper.base_mapper
cached_connections = _cached_connection_dict(base_mapper)
@@ -58,7 +59,7 @@ def _bulk_insert(
has_all_defaults in _collect_insert_commands(table, (
(None, mapping, mapper, connection)
for mapping in mappings),
- bulk=True, return_defaults=return_defaults
+ bulk=True, return_defaults=return_defaults, with_none=with_none
)
)
_emit_insert_statements(base_mapper, None,
@@ -363,7 +364,7 @@ def _organize_states_for_delete(base_mapper, states, uowtransaction):
def _collect_insert_commands(
table, states_to_insert,
- bulk=False, return_defaults=False):
+ bulk=False, return_defaults=False, with_none=False):
"""Identify sets of values to use in INSERT statements for a
list of states.
@@ -382,7 +383,7 @@ def _collect_insert_commands(
for propkey in set(propkey_to_col).intersection(state_dict):
value = state_dict[propkey]
col = propkey_to_col[propkey]
- if value is None and propkey not in eval_none:
+ if value is None and propkey not in eval_none and not with_none:
continue
elif not bulk and isinstance(value, sql.ClauseElement):
value_params[col.key] = value