From 9ab4da7018eae8fc86430c24a38f8ffb0a5951ab Mon Sep 17 00:00:00 2001 From: Federico Caselli Date: Sat, 22 Aug 2020 00:30:44 +0200 Subject: Updates for MariaDB sequences MariaDB should not run a Sequence if it has optional=True. Additionally, rework the rules in crud.py to accommodate the new combination MariaDB brings us, which is a dialect that supports both cursor.lastrowid, explicit sequences, *and* no support for returning. Co-authored-by: Mike Bayer Fixes: #5528 Change-Id: I9a8ea69a34983affa95dfd22186e2908fdf0d58c --- lib/sqlalchemy/engine/default.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'lib/sqlalchemy/engine') diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py index ec0f2ed9f..564258a28 100644 --- a/lib/sqlalchemy/engine/default.py +++ b/lib/sqlalchemy/engine/default.py @@ -1315,15 +1315,8 @@ class DefaultExecutionContext(interfaces.ExecutionContext): def _setup_dml_or_text_result(self): if self.isinsert: - if ( - not self._is_implicit_returning - and not self.compiled.inline - and self.dialect.postfetch_lastrowid - and not self.executemany - ): - + if self.compiled.postfetch_lastrowid: self._setup_ins_pk_from_lastrowid() - elif not self._is_implicit_returning: self._setup_ins_pk_from_empty() -- cgit v1.2.1