summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/engine/default.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/engine/default.py')
-rw-r--r--lib/sqlalchemy/engine/default.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py
index 733a89076..891103ee0 100644
--- a/lib/sqlalchemy/engine/default.py
+++ b/lib/sqlalchemy/engine/default.py
@@ -502,6 +502,7 @@ class DefaultExecutionContext(interfaces.ExecutionContext):
compiled = None
statement = None
result_column_struct = None
+ returned_defaults = None
_is_implicit_returning = False
_is_explicit_returning = False
@@ -917,10 +918,13 @@ class DefaultExecutionContext(interfaces.ExecutionContext):
]
def _setup_ins_pk_from_implicit_returning(self, row):
+ if row is None:
+ self.inserted_primary_key = None
+ return
+
key_getter = self.compiled._key_getters_for_crud_column[2]
table = self.compiled.statement.table
compiled_params = self.compiled_parameters[0]
-
self.inserted_primary_key = [
row[col] if value is None else value
for col, value in [