summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-11-22 18:35:36 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2013-11-22 18:37:35 -0500
commitad85ab12d62e65b0310c778057551bcdd460f0d9 (patch)
tree9ea65d5fa76cd7003e648b4d97f8f2bc1e017805 /lib
parent9d848680f46ffdabca84d7e2b3a4fd862d1f0bda (diff)
downloadsqlalchemy-ad85ab12d62e65b0310c778057551bcdd460f0d9.tar.gz
- Fixed bug where SQL statement would be improperly ASCII-encoded
when a pre-DBAPI :class:`.StatementError` were raised within :meth:`.Connection.execute`, causing encoding errors for non-ASCII statements. The stringification now remains within Python unicode thus avoiding encoding errors. [ticket:2871] Conflicts: test/engine/test_execute.py
Diffstat (limited to 'lib')
-rw-r--r--lib/sqlalchemy/engine/base.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index 25167167d..57d0445dd 100644
--- a/lib/sqlalchemy/engine/base.py
+++ b/lib/sqlalchemy/engine/base.py
@@ -824,7 +824,7 @@ class Connection(Connectable):
context = constructor(dialect, self, conn, *args)
except Exception, e:
self._handle_dbapi_exception(e,
- str(statement), parameters,
+ util.text_type(statement), parameters,
None, None)
if context.compiled: