From: Philip Jenvey <pjenvey@underboss.org>
Date: Wed, 22 Jul 2009 00:43:42 +0000 (+0000)
Subject: revert the unicode check from r6162, zxjdbc just needs the correct
X-Git-Tag: rel_0_6_6~88
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29f8048f4da6d3eda0c589df30d3359bb05d8319;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

revert the unicode check from r6162, zxjdbc just needs the correct
description_encoding
fixes #1479
---

diff --git a/lib/sqlalchemy/connectors/zxJDBC.py b/lib/sqlalchemy/connectors/zxJDBC.py
index 9d91b30ed1..3cdfeb32e4 100644
--- a/lib/sqlalchemy/connectors/zxJDBC.py
+++ b/lib/sqlalchemy/connectors/zxJDBC.py
@@ -9,6 +9,7 @@ class ZxJDBCConnector(Connector):
     
     supports_unicode_binds = True
     supports_unicode_statements = sys.version > '2.5.0+'
+    description_encoding = None
     default_paramstyle = 'qmark'
     
     jdbc_db_name = None
diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index c3aeb54515..7fff18d023 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 and not isinstance(colname, unicode):
+            if self.dialect.description_encoding:
                 colname = colname.decode(self.dialect.description_encoding)
 
             if '.' in colname: