Skip to content

Set connection properties #44

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

Merged
qpresley merged 2 commits into from
Mar 10, 2017
Merged

Set connection properties #44

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92348bb
Add setConnectionProperties prototype
Mar 10, 2017
fc626fd
Fix test failures
Mar 10, 2017
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
60 changes: 32 additions & 28 deletions lib/ibmdb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,34 +42,41 @@ function IBMDB(name, settings) {
debug('IBMDB constructor settings: %j', settings);
SQLConnector.call(this, name, settings);

this.dbname = (settings.database || settings.db || 'testdb');
this.dsn = settings.dsn;
this.hostname = (settings.hostname || settings.host);
this.username = (settings.username || settings.user);
this.password = settings.password;
this.portnumber = settings.port;
this.protocol = (settings.protocol || 'TCPIP');

// Save off the connectionOptions passed in for connection pooling
this.connectionOptions = {};
this.connectionOptions.minPoolSize = parseInt(settings.minPoolSize, 10) || 0;
this.connectionOptions.maxPoolSize = parseInt(settings.maxPoolSize, 10) || 0;
this.connectionOptions.connectionTimeout =
parseInt(settings.connectionTimeout, 10) || 60;

// Create the Connection Pool object. It will be initialized once we
// have the connection string prepped below.
this.setConnectionProperties(name, settings);
this.client = new Driver.Pool(this.connectionOptions);
this.client.init(this.connectionOptions.minPoolSize, this.connStr);
};

util.inherits(IBMDB, SQLConnector);

IBMDB.prototype.setConnectionProperties = function(name, settings) {
var self = this;
self.dbname = (settings.database || settings.db || 'testdb');
self.dsn = settings.dsn;
self.hostname = (settings.hostname || settings.host);
self.username = (settings.username || settings.user);
self.password = settings.password;
self.portnumber = settings.port;
self.protocol = (settings.protocol || 'TCPIP');

// Save off the connectionOptions passed in for connection pooling
self.connectionOptions = {};
self.connectionOptions.minPoolSize = parseInt(settings.minPoolSize, 10) || 0;
self.connectionOptions.maxPoolSize = parseInt(settings.maxPoolSize, 10) || 0;
self.connectionOptions.connectionTimeout =
parseInt(settings.connectionTimeout, 10) || 60;

var dsn = settings.dsn;
if (dsn) {
this.connStr = dsn;
self.connStr = dsn;

var DSNObject = parseDSN(dsn);
var DSNObject = self.parseDSN(dsn);
if (!('CurrentSchema' in DSNObject)) {
this.connStr += ';CurrentSchema=' + DSNObject.UID;
self.connStr += ';CurrentSchema=' + DSNObject.UID;
}
this.schema = DSNObject.CurrentSchema || DSNObject.UID;
self.schema = DSNObject.CurrentSchema || DSNObject.UID;
} else {
var connStrGenerate =
'DRIVER={' + name + '}' +
Expand All @@ -79,22 +86,19 @@ function IBMDB(name, settings) {
';PWD=' + this.password +
';PORT=' + this.portnumber +
';PROTOCOL=' + this.protocol;
this.connStr = connStrGenerate;
self.connStr = connStrGenerate;

this.schema = this.username;
self.schema = this.username;
if (settings.schema) {
this.schema = settings.schema.toUpperCase();
self.schema = settings.schema.toUpperCase();
}

this.connStr += ';CurrentSchema=' + this.schema;
self.connStr += ';CurrentSchema=' + self.schema;
}

this.client.init(this.connectionOptions.minPoolSize, this.connStr);
};

util.inherits(IBMDB, SQLConnector);

function parseDSN(dsn) {
IBMDB.prototype.parseDSN = function(dsn) {
// Split dsn into an array of optionStr
var dsnOption = dsn.split(';');
// Handle dsn string ended with ';'
Expand All @@ -110,7 +114,7 @@ function parseDSN(dsn) {
});

return result;
}
};

IBMDB.prototype.tableEscaped = function(model) {
var escapedName = this.escapeName(this.table(model));
Expand Down