Merge pull request #86 from laughingman7743/support_jpype_0_7_0

Support JPype 0.7.0

Author: laughingman7743

Pipfile.lock

@@ -108,12 +108,16 @@ def _to_default(result_set, index):
 class JDBCTypeConverter(object):
 
     def __init__(self):
+        modifier = jpype.java.lang.reflect.Modifier
         types = jpype.java.sql.Types
         self._jdbc_type_name_mappings = dict()
         self._jdbc_type_code_mappings = dict()
-        for field in types.__javaclass__.getClassFields():
-            self._jdbc_type_name_mappings[field.getName()] = field.getStaticAttribute()
-            self._jdbc_type_code_mappings[field.getStaticAttribute()] = field.getName()
+        for field in types.class_.getFields():
+            if modifier.isStatic(field.getModifiers()):
+                name = field.getName()
+                attr = getattr(types, field.getName())
+                self._jdbc_type_name_mappings[name] = attr
+                self._jdbc_type_code_mappings[attr] = name
         _logger.debug(self._jdbc_type_name_mappings)
         self._converter_mappings = dict()
         for k, v in iteritems(_DEFAULT_CONVERTERS):

pyathenajdbc/converter.py

@@ -8,8 +8,7 @@
 from past.builtins.misc import xrange
 
 from pyathenajdbc.error import (DatabaseError, NotSupportedError, ProgrammingError)
-from pyathenajdbc.util import (attach_thread_to_jvm, synchronized,
-                               unwrap_exception)
+from pyathenajdbc.util import (attach_thread_to_jvm, synchronized)
 
 _logger = logging.getLogger(__name__)
 
@@ -125,7 +124,7 @@ def execute(self, operation, parameters=None):
                 self._update_count = self._statement.getUpdateCount()
         except Exception as e:
             _logger.exception('Failed to execute query.')
-            raise_from(DatabaseError(unwrap_exception(e)), e)
+            raise_from(DatabaseError(e), e)
 
     def executemany(self, operation, seq_of_parameters):
         raise NotSupportedError

pyathenajdbc/cursor.py

@@ -48,17 +48,3 @@ def to_datetime(java_date):
                     cal.get(jpype.java.util.Calendar.HOUR_OF_DAY),
                     cal.get(jpype.java.util.Calendar.MINUTE),
                     cal.get(jpype.java.util.Calendar.SECOND))
-
-
-def unwrap_exception(exc):
-    import jpype
-    if isinstance(exc, jpype._jexception.JavaException) and \
-            issubclass(exc.__javaclass__, jpype.java.sql.SQLException):
-        args = exc.args
-        if args:
-            cause = args[0].cause
-            if cause:
-                return cause
-            else:
-                return args[0]
-    return exc