Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for JVM options with jpype #116

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −3
Open

Add support for JVM options with jpype #116

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions jaydebeapi/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ def _handle_sql_exception_jpype():
exc_type = InterfaceError
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, java_opts, jars, libs):
import jpype
if not jpype.isJVMStarted():
args = []
Expand All @@ -168,6 +168,9 @@ def _jdbc_connect_jpype(jclassname, url, driver_args, jars, libs):
if class_path:
args.append('-Djava.class.path=%s' %
os.path.pathsep.join(class_path))
if java_opts:
for arg in java_opts:
args.append(arg)
if libs:
# path to shared libraries
libs_path = os.path.pathsep.join(libs)
Expand Down Expand Up @@ -367,12 +370,14 @@ 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, java_opts=None, jars=None, libs=None):
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please add the java_opt at the end of the args. Otherwise this change will break backwards compatibility for code that doesn't use kwargs but relies on the order of the arguments.

"""Open a connection to a database using a JDBC driver and return
a Connection instance.

jclassname: Full qualified Java class name of the JDBC driver.
url: Database url as required by the JDBC driver.
java_opts: List of JVM options with format %option%=%value%.
Only works with jpype
driver_args: Dictionary or sequence of arguments to be passed to
the Java DriverManager.getConnection method. Usually
sequence of username and password for the db. Alternatively
Expand All @@ -388,6 +393,10 @@ def connect(jclassname, url, driver_args=None, jars=None, libs=None):
driver_args = [ driver_args ]
if not driver_args:
driver_args = []
if isinstance(java_opts, string_type):
java_opts = [ java_opts ]
if not java_opts:
java_opts = []
if jars:
if isinstance(jars, string_type):
jars = [ jars ]
Expand All @@ -398,7 +407,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, java_opts, jars, libs)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will fail on Jython. Please provide at least the parameter to _jdbc_connect_jython

return Connection(jconn, _converters)

# DB-API 2.0 Connection Object
Expand Down