summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/engine
diff options
context:
space:
mode:
authorJason Kirtland <jek@discorporate.us>2007-10-08 03:01:04 +0000
committerJason Kirtland <jek@discorporate.us>2007-10-08 03:01:04 +0000
commitafa713d9e84e5833f75543811d4978eb003fae46 (patch)
treee788d701e205d99444d0eb66b9297d10c8d9dd5d /lib/sqlalchemy/engine
parent849743acacf977657c2dbfdb895b618631539be5 (diff)
downloadsqlalchemy-afa713d9e84e5833f75543811d4978eb003fae46.tar.gz
- Loosened up test_cant_execute_join for oracle (probably) + bonus typo fix
- Some docstring formatting waiting for pg to finish the tests... waiting...
Diffstat (limited to 'lib/sqlalchemy/engine')
-rw-r--r--lib/sqlalchemy/engine/base.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index fa58657dc..656384ba6 100644
--- a/lib/sqlalchemy/engine/base.py
+++ b/lib/sqlalchemy/engine/base.py
@@ -778,7 +778,7 @@ class Connection(Connectable):
if c in Connection.executors:
return Connection.executors[c](self, object, multiparams, params)
else:
- raise exceptions.InvalidRequestError("Unexecuteable object type: " + str(type(object)))
+ raise exceptions.InvalidRequestError("Unexecutable object type: " + str(type(object)))
def _execute_default(self, default, multiparams=None, params=None):
return self.__engine.dialect.defaultrunner(self.__create_execution_context()).traverse_single(default)
@@ -831,7 +831,7 @@ class Connection(Connectable):
def _execute_compiled(self, compiled, multiparams=None, params=None, distilled_params=None):
"""Execute a sql.Compiled object."""
if not compiled.can_execute:
- raise exceptions.ArgumentError("Not an executeable clause: %s" % (str(compiled)))
+ raise exceptions.ArgumentError("Not an executable clause: %s" % (str(compiled)))
if distilled_params is None:
distilled_params = self.__distill_params(multiparams, params)