summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/engine/default.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-10-04 18:26:55 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2012-10-04 18:26:55 -0400
commit70be21311772c687105802850380050bfeb4bd82 (patch)
tree943c77a08957fbd80745f294b849350092981218 /lib/sqlalchemy/engine/default.py
parent0b1452bf1122527b0486cfb3b024d61e9d3c876b (diff)
downloadsqlalchemy-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.py6
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()]