summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/engine/default.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2016-08-31 14:34:54 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2016-08-31 17:04:35 -0400
commitc7b9c84312b6b252e68ea704670d0ea7fc0042f0 (patch)
treea71b8cbbb123e10a779c3a1f8efb4fc09ce47bf1 /lib/sqlalchemy/engine/default.py
parent53c3119ebb6801cbfcaf2841311d117eba250444 (diff)
downloadsqlalchemy-c7b9c84312b6b252e68ea704670d0ea7fc0042f0.tar.gz
Check for supports_execution at ClauseElement base
Raise a more descriptive exception / message when ClauseElement or non-SQLAlchemy objects that are not "executable" are erroneously passed to ``.execute()``; a new exception ObjectNotExecutableError is raised consistently in all cases. Change-Id: I2dd393121e2c7e5b6b9e40286a2f25670876e8e4 Fixes: #3786
Diffstat (limited to 'lib/sqlalchemy/engine/default.py')
-rw-r--r--lib/sqlalchemy/engine/default.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py
index 1bb575984..bd6e37d6c 100644
--- a/lib/sqlalchemy/engine/default.py
+++ b/lib/sqlalchemy/engine/default.py
@@ -554,8 +554,9 @@ class DefaultExecutionContext(interfaces.ExecutionContext):
self.compiled = compiled
- if not compiled.can_execute:
- raise exc.ArgumentError("Not an executable clause")
+ # this should be caught in the engine before
+ # we get here
+ assert compiled.can_execute
self.execution_options = compiled.statement._execution_options.union(
connection._execution_options)