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 9d91b30ed13b0f4f99870b7ba3e73c2c85cb7376..3cdfeb32e46bf8c8cbead1878ecaeabcf3f7593c 100644 (file)
--- 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 c3aeb54515bceeea8f1fd1a81538a58fd64419e3..7fff18d0239fbea58dcd886d32cd7805875555be 100644 (file)
--- 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: