summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/sqlalchemy/engine/default.py4
-rw-r--r--lib/sqlalchemy/sql/expression.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py
index a7f6dc4fa..ca5106c34 100644
--- a/lib/sqlalchemy/engine/default.py
+++ b/lib/sqlalchemy/engine/default.py
@@ -256,8 +256,8 @@ class DefaultExecutionContext(base.ExecutionContext):
self.isupdate = compiled.isupdate
self.isdelete = compiled.isdelete
self.should_autocommit = compiled.statement._autocommit
- if isinstance(compiled.statement, expression._TextClause):
- self.should_autocommit = self.should_autocommit or self.should_autocommit_text(self.statement)
+ if self.should_autocommit is expression.PARSE_AUTOCOMMIT:
+ self.should_autocommit = self.should_autocommit_text(self.statement)
if not parameters:
self.compiled_parameters = [compiled.construct_params()]
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index 5e4978bfb..a7cba8161 100644
--- a/lib/sqlalchemy/sql/expression.py
+++ b/lib/sqlalchemy/sql/expression.py
@@ -49,7 +49,7 @@ __all__ = [
'literal_column', 'not_', 'null', 'or_', 'outparam', 'outerjoin', 'select',
'subquery', 'table', 'text', 'union', 'union_all', 'update', ]
-
+PARSE_AUTOCOMMIT = util._symbol('PARSE_AUTOCOMMIT')
def desc(column):
"""Return a descending ``ORDER BY`` clause element.
@@ -2189,7 +2189,7 @@ class _TextClause(ClauseElement):
_hide_froms = []
def __init__(self, text = "", bind=None,
- bindparams=None, typemap=None, autocommit=False):
+ bindparams=None, typemap=None, autocommit=PARSE_AUTOCOMMIT):
self._bind = bind
self.bindparams = {}
self.typemap = typemap