diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2008-02-06 17:44:48 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2008-02-06 17:44:48 +0000 |
| commit | 6e498f1a21826ed2070543414ee633526bd126fc (patch) | |
| tree | 9eea37114a80a720e9b27eb4092f6926c9aae5ec /lib | |
| parent | 45064259664196c6e074cfb76366abe45d80c0fb (diff) | |
| download | sqlalchemy-6e498f1a21826ed2070543414ee633526bd126fc.tar.gz | |
check for unicode first before encoding
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sqlalchemy/engine/base.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/engine/default.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py index 1a13fdeeb..f426d93a6 100644 --- a/lib/sqlalchemy/engine/base.py +++ b/lib/sqlalchemy/engine/base.py @@ -1825,7 +1825,7 @@ class DefaultRunner(schema.SchemaVisitor): """execute a string statement, using the raw cursor, and return a scalar result.""" conn = self.context._connection - if not self.dialect.supports_unicode_statements: + if isinstance(stmt, unicode) and not self.dialect.supports_unicode_statements: stmt = stmt.encode(self.dialect.encoding) conn._cursor_execute(self.context.cursor, stmt, params) return self.context.cursor.fetchone()[0] diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py index 3b93862ae..5c6a67b28 100644 --- a/lib/sqlalchemy/engine/default.py +++ b/lib/sqlalchemy/engine/default.py @@ -185,7 +185,7 @@ class DefaultExecutionContext(base.ExecutionContext): self.result_map = None self.parameters = self.__encode_param_keys(parameters) self.executemany = len(parameters) > 1 - if not dialect.supports_unicode_statements: + if isinstance(statement, unicode) and not dialect.supports_unicode_statements: self.statement = statement.encode(self.dialect.encoding) else: self.statement = statement |
