From cbcecde6dbeae15af97e209848ac91bf4c40478d Mon Sep 17 00:00:00 2001 From: Philip Jenvey Date: Tue, 21 Jul 2009 03:10:53 +0000 Subject: [PATCH] use supports_unicode_statements on Jython trunk and handle unicode cursor description names from zxJDBC --- lib/sqlalchemy/connectors/zxJDBC.py | 3 ++- lib/sqlalchemy/engine/base.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/sqlalchemy/connectors/zxJDBC.py b/lib/sqlalchemy/connectors/zxJDBC.py index 2d4d713727..9d91b30ed1 100644 --- a/lib/sqlalchemy/connectors/zxJDBC.py +++ b/lib/sqlalchemy/connectors/zxJDBC.py @@ -1,3 +1,4 @@ +import sys from sqlalchemy.connectors import Connector class ZxJDBCConnector(Connector): @@ -7,7 +8,7 @@ class ZxJDBCConnector(Connector): supports_sane_multi_rowcount = False supports_unicode_binds = True - supports_unicode_statements = False + supports_unicode_statements = sys.version > '2.5.0+' default_paramstyle = 'qmark' jdbc_db_name = None diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py index 7fff18d023..c3aeb54515 100644 --- a/lib/sqlalchemy/engine/base.py +++ b/lib/sqlalchemy/engine/base.py @@ -1639,7 +1639,7 @@ class ResultProxy(object): for i, (colname, coltype) in enumerate(metadata): - if self.dialect.description_encoding: + if self.dialect.description_encoding and not isinstance(colname, unicode): colname = colname.decode(self.dialect.description_encoding) if '.' in colname: -- 2.47.3