diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sqlalchemy/orm/persistence.py | 1 | ||||
| -rw-r--r-- | lib/sqlalchemy/testing/assertsql.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/persistence.py b/lib/sqlalchemy/orm/persistence.py index 9b631d2b0..4ac7b5538 100644 --- a/lib/sqlalchemy/orm/persistence.py +++ b/lib/sqlalchemy/orm/persistence.py @@ -750,6 +750,7 @@ def _emit_insert_statements(base_mapper, uowtransaction, bool(rec[5]), # whether we have "value" parameters rec[6], rec[7])): + if not bookkeeping or \ ( has_all_defaults diff --git a/lib/sqlalchemy/testing/assertsql.py b/lib/sqlalchemy/testing/assertsql.py index ce01e9b81..397e62338 100644 --- a/lib/sqlalchemy/testing/assertsql.py +++ b/lib/sqlalchemy/testing/assertsql.py @@ -70,7 +70,7 @@ class CompiledSQL(SQLMatchRule): def _compile_dialect(self, execute_observed): if self.dialect == 'default': - return DefaultDialect(implicit_returning=True) + return DefaultDialect() else: # ugh if self.dialect == 'postgresql': |