diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-10-04 18:26:55 -0400 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-10-04 18:26:55 -0400 |
commit | 70be21311772c687105802850380050bfeb4bd82 (patch) | |
tree | 943c77a08957fbd80745f294b849350092981218 /lib/sqlalchemy/engine/default.py | |
parent | 0b1452bf1122527b0486cfb3b024d61e9d3c876b (diff) | |
download | sqlalchemy-70be21311772c687105802850380050bfeb4bd82.tar.gz |
- add back __engine_options__
- break test_insert tests into explicitly get_lastrowid() vs. implicit_returning tests,
fix up requirements to split them out
Diffstat (limited to 'lib/sqlalchemy/engine/default.py')
-rw-r--r-- | lib/sqlalchemy/engine/default.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py index 778ec6be6..21e02fcdc 100644 --- a/lib/sqlalchemy/engine/default.py +++ b/lib/sqlalchemy/engine/default.py @@ -441,9 +441,9 @@ class DefaultExecutionContext(interfaces.ExecutionContext): self.isdelete = compiled.isdelete if self.isinsert or self.isupdate or self.isdelete: - self._is_explicit_returning = compiled.statement._returning - self._is_implicit_returning = compiled.returning and \ - not compiled.statement._returning + self._is_explicit_returning = bool(compiled.statement._returning) + self._is_implicit_returning = bool(compiled.returning and \ + not compiled.statement._returning) if not parameters: self.compiled_parameters = [compiled.construct_params()] |