From 3405aa7b53c2d350edda76442feb9caa768ff8c1 Mon Sep 17 00:00:00 2001 From: Paulius Date: Wed, 16 Sep 2020 11:06:24 +0300 Subject: [PATCH 1/2] Add JVM arg argument --- jaydebeapi/__init__.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/jaydebeapi/__init__.py b/jaydebeapi/__init__.py index a890c3d..db6b00a 100644 --- a/jaydebeapi/__init__.py +++ b/jaydebeapi/__init__.py @@ -85,7 +85,7 @@ def _handle_sql_exception_jython(): exc_type = InterfaceError reraise(exc_type, exc_info[1], exc_info[2]) -def _jdbc_connect_jython(jclassname, url, driver_args, jars, libs): +def _jdbc_connect_jython(jclassname, url, driver_args, jars, libs, jvm_args): if _jdbc_name_to_const is None: from java.sql import Types types = Types @@ -164,10 +164,10 @@ def _handle_sql_exception_jpype(): reraise(exc_type, exc_info[1], exc_info[2]) -def _jdbc_connect_jpype(jclassname, url, driver_args, jars, libs): +def _jdbc_connect_jpype(jclassname, url, driver_args, jars, libs, jvm_args): import jpype if not jpype.isJVMStarted(): - args = [] + args = jvm_args or [] class_path = [] if jars: class_path.extend(jars) @@ -378,7 +378,7 @@ def TimestampFromTicks(ticks): return apply(Timestamp, time.localtime(ticks)[:6]) # DB-API 2.0 Module Interface connect constructor -def connect(jclassname, url, driver_args=None, jars=None, libs=None): +def connect(jclassname, url, driver_args=None, jars=None, libs=None, jvm_args=None): """Open a connection to a database using a JDBC driver and return a Connection instance. @@ -394,6 +394,7 @@ def connect(jclassname, url, driver_args=None, jars=None, libs=None): jars: Jar filename or sequence of filenames for the JDBC driver libs: Dll/so filenames or sequence of dlls/sos used as shared library by the JDBC driver + jvm_args: additional JVM arguments to be passed """ if isinstance(driver_args, string_type): driver_args = [ driver_args ] @@ -409,7 +410,7 @@ def connect(jclassname, url, driver_args=None, jars=None, libs=None): libs = [ libs ] else: libs = [] - jconn = _jdbc_connect(jclassname, url, driver_args, jars, libs) + jconn = _jdbc_connect(jclassname, url, driver_args, jars, libs, jvm_args) return Connection(jconn, _converters) # DB-API 2.0 Connection Object From 6b95bad0a3137a86acea4c58579d18fa5d7d7666 Mon Sep 17 00:00:00 2001 From: Paulius Date: Thu, 4 Mar 2021 18:11:10 +0200 Subject: [PATCH 2/2] Bump version until upstream owner reviews --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 67a2d1d..1395b11 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ setup( #basic package data name = 'JayDeBeApi', - version = '1.2.3', + version = '1.2.4', author = 'Bastian Bowe', author_email = 'bastian.dev@gmail.com', license = 'GNU LGPL',