Skip to content

Commit

Permalink
2.4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
markheger committed Jun 24, 2019
1 parent db01ae1 commit 2a3ea48
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion package/docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
# The short X.Y version.
version = '2.4'
# The full version, including alpha/beta/rc tags.
release = '2.4.1'
release = '2.4.2'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion package/streamsx/eventstore/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"""

__version__='2.4.1'
__version__='2.4.2'

__all__ = ['insert', 'configure_connection', 'download_toolkit', 'get_service_details', 'get_certificate', 'run_statement']
from streamsx.eventstore._eventstore import insert,configure_connection,download_toolkit,get_service_details,get_certificate,run_statement
10 changes: 6 additions & 4 deletions package/streamsx/eventstore/_eventstore.py
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,11 @@ def configure_connection(instance, name='eventstore', database=None, connection=
conn = connection.split(";", 1)
credentials['username']=user
credentials['password']=password
jdbcurl = 'jdbc:db2://' + conn[0] + '/' + database
if ',' in conn[0]:
jdbc_conn = conn[0].split(",", 1)
jdbcurl = 'jdbc:db2://' + jdbc_conn[0] + '/' + database
else:
jdbcurl = 'jdbc:db2://' + conn[0] + '/' + database
credentials['jdbcurl']=jdbcurl
# add for app config
properties ['credentials'] = json.dumps (credentials)
Expand Down Expand Up @@ -508,7 +512,7 @@ def insert(stream, table, schema_name=None, database=None, connection=None, user


class _EventStoreSink(streamsx.spl.op.Invoke):
def __init__(self, stream, schema, tableName, connectionString=None, databaseName=None, schemaName=None, batchSize=None, configObject=None, eventStorePassword=None, eventStoreUser=None, frontEndConnectionFlag=None, maxNumActiveBatches=None, nullMapString=None, partitioningKey=None, preserveOrder=None, primaryKey=None, keyStore=None, keyStorePassword=None, pluginFlag=None, pluginName=None, sslConnection=None, trustStore=None, trustStorePassword=None, vmArg=None, name=None):
def __init__(self, stream, schema, tableName, connectionString=None, databaseName=None, schemaName=None, batchSize=None, configObject=None, eventStorePassword=None, eventStoreUser=None, frontEndConnectionFlag=None, maxNumActiveBatches=None, partitioningKey=None, preserveOrder=None, primaryKey=None, keyStore=None, keyStorePassword=None, pluginFlag=None, pluginName=None, sslConnection=None, trustStore=None, trustStorePassword=None, vmArg=None, name=None):
topology = stream.topology
kind="com.ibm.streamsx.eventstore::EventStoreSink"
inputs=stream
Expand Down Expand Up @@ -536,8 +540,6 @@ def __init__(self, stream, schema, tableName, connectionString=None, databaseNam
params['frontEndConnectionFlag'] = frontEndConnectionFlag
if maxNumActiveBatches is not None:
params['maxNumActiveBatches'] = maxNumActiveBatches
if nullMapString is not None:
params['nullMapString'] = nullMapString
if partitioningKey is not None:
params['partitioningKey'] = partitioningKey
if preserveOrder is not None:
Expand Down

0 comments on commit 2a3ea48

Please sign in to comment.