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 additional config options: #580

Merged
merged 6 commits into from
Sep 12, 2017
Merged

Add additional config options: #580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
feef582
Add additional config options:
ariskemper May 18, 2017
d9438b2
Added missing unit tests for IMPLICIT_TRANSACTIONS and
tvrprasad May 18, 2017
dfdf908
Refactor common code out of unit tests for enableCursorCloseOnCommit and
tvrprasad May 18, 2017
fbcef3a
Further refactored by making option name a parameter.
tvrprasad May 18, 2017
79b9272
Converted all the boolean option functions to use testBooleanConfigOp…
tvrprasad May 18, 2017
9978105
Merge branch 'master' into more-config-options
Sep 12, 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
129 changes: 123 additions & 6 deletions src/connection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ const DEFAULT_TEXTSIZE = '2147483647';
const DEFAULT_DATEFIRST = 7;
const DEFAULT_PORT = 1433;
const DEFAULT_TDS_VERSION = '7_4';
const DEFAULT_LANGUAGE = 'us_english';
const DEFAULT_DATEFORMAT = 'mdy';

class Connection extends EventEmitter {
constructor(config) {
Expand All @@ -61,31 +63,41 @@ class Connection extends EventEmitter {
camelCaseColumns: false,
cancelTimeout: DEFAULT_CANCEL_TIMEOUT,
columnNameReplacer: undefined,
connectionRetryInterval: DEFAULT_CONNECT_RETRY_INTERVAL,
connectTimeout: DEFAULT_CONNECT_TIMEOUT,
connectionIsolationLevel: ISOLATION_LEVEL.READ_COMMITTED,
cryptoCredentialsDetails: {},
database: undefined,
datefirst: DEFAULT_DATEFIRST,
dateFormat: DEFAULT_DATEFORMAT,
debug: {
data: false,
packet: false,
payload: false,
token: false
},
enableArithAbort: false,
enableAnsiNull: true,
enableAnsiNullDefault: true,
enableAnsiPadding: true,
enableAnsiWarnings: true,
enableArithAbort: false,
enableConcatNullYieldsNull: true,
enableCursorCloseOnCommit: false,
enableImplicitTransactions: false,
enableNumericRoundabort: false,
enableQuotedIdentifier: true,
encrypt: false,
fallbackToDefaultDb: false,
instanceName: undefined,
isolationLevel: ISOLATION_LEVEL.READ_COMMITTED,
language: DEFAULT_LANGUAGE,
localAddress: undefined,
maxRetriesOnTransientErrors: 3,
multiSubnetFailover: false,
packetSize: DEFAULT_PACKET_SIZE,
port: DEFAULT_PORT,
readOnlyIntent: false,
requestTimeout: DEFAULT_CLIENT_REQUEST_TIMEOUT,
maxRetriesOnTransientErrors: 3,
connectionRetryInterval: DEFAULT_CONNECT_RETRY_INTERVAL,
rowCollectionOnDone: false,
rowCollectionOnRequestCompletion: false,
tdsVersion: DEFAULT_TDS_VERSION,
Expand All @@ -102,6 +114,10 @@ class Connection extends EventEmitter {
}

if (config.options.abortTransactionOnError != undefined) {
if (typeof config.options.abortTransactionOnError !== 'boolean') {
throw new TypeError('options.abortTransactionOnError must be a boolean (true or false).');
}

this.config.options.abortTransactionOnError = config.options.abortTransactionOnError;
}

Expand Down Expand Up @@ -149,6 +165,10 @@ class Connection extends EventEmitter {
this.config.options.datefirst = config.options.datefirst;
}

if (config.options.dateFormat != undefined) {
this.config.options.dateFormat = config.options.dateFormat;
}

if (config.options.debug) {
if (config.options.debug.data != undefined) {
this.config.options.debug.data = config.options.debug.data;
Expand All @@ -164,10 +184,38 @@ class Connection extends EventEmitter {
}
}

if (config.options.enableAnsiNull != undefined) {
if (typeof config.options.enableAnsiNull !== 'boolean') {
throw new TypeError('options.enableAnsiNull must be a boolean (true or false).');
}

this.config.options.enableAnsiNull = config.options.enableAnsiNull;
}

if (config.options.enableAnsiNullDefault != undefined) {
if (typeof config.options.enableAnsiNullDefault !== 'boolean') {
throw new TypeError('options.enableAnsiNullDefault must be a boolean (true or false).');
}

this.config.options.enableAnsiNullDefault = config.options.enableAnsiNullDefault;
}

if (config.options.enableAnsiPadding != undefined) {
if (typeof config.options.enableAnsiPadding !== 'boolean') {
throw new TypeError('options.enableAnsiPadding must be a boolean (true or false).');
}

this.config.options.enableAnsiPadding = config.options.enableAnsiPadding;
}

if (config.options.enableAnsiWarnings != undefined) {
if (typeof config.options.enableAnsiWarnings !== 'boolean') {
throw new TypeError('options.enableAnsiWarnings must be a boolean (true or false).');
}

this.config.options.enableAnsiWarnings = config.options.enableAnsiWarnings;
}

if (config.options.enableArithAbort !== undefined) {
if (typeof config.options.enableArithAbort !== 'boolean') {
throw new TypeError('options.enableArithAbort must be a boolean (true or false).');
Expand All @@ -176,6 +224,46 @@ class Connection extends EventEmitter {
this.config.options.enableArithAbort = config.options.enableArithAbort;
}

if (config.options.enableConcatNullYieldsNull != undefined) {
if (typeof config.options.enableConcatNullYieldsNull !== 'boolean') {
throw new TypeError('options.enableConcatNullYieldsNull must be a boolean (true or false).');
}

this.config.options.enableConcatNullYieldsNull = config.options.enableConcatNullYieldsNull;
}

if (config.options.enableCursorCloseOnCommit != undefined) {
if (typeof config.options.enableCursorCloseOnCommit !== 'boolean') {
throw new TypeError('options.enableCursorCloseOnCommit must be a boolean (true or false).');
}

this.config.options.enableCursorCloseOnCommit = config.options.enableCursorCloseOnCommit;
}

if (config.options.enableImplicitTransactions != undefined) {
if (typeof config.options.enableImplicitTransactions !== 'boolean') {
throw new TypeError('options.enableImplicitTransactions must be a boolean (true or false).');
}

this.config.options.enableImplicitTransactions = config.options.enableImplicitTransactions;
}

if (config.options.enableNumericRoundabort != undefined) {
if (typeof config.options.enableNumericRoundabort !== 'boolean') {
throw new TypeError('options.enableNumericRoundabort must be a boolean (true or false).');
}

this.config.options.enableNumericRoundabort = config.options.enableNumericRoundabort;
}

if (config.options.enableQuotedIdentifier !== undefined) {
if (typeof config.options.enableQuotedIdentifier !== 'boolean') {
throw new TypeError('options.enableQuotedIdentifier must be a boolean (true or false).');
}

this.config.options.enableQuotedIdentifier = config.options.enableQuotedIdentifier;
}

if (config.options.encrypt != undefined) {
this.config.options.encrypt = config.options.encrypt;
}
Expand All @@ -193,6 +281,10 @@ class Connection extends EventEmitter {
this.config.options.isolationLevel = config.options.isolationLevel;
}

if (config.options.language != undefined) {
this.config.options.language = config.options.language;
}

if (config.options.localAddress != undefined) {
this.config.options.localAddress = config.options.localAddress;
}
Expand Down Expand Up @@ -788,7 +880,8 @@ class Connection extends EventEmitter {
tdsVersion: this.config.options.tdsVersion,
initDbFatal: !this.config.options.fallbackToDefaultDb,
readOnlyIntent: this.config.options.readOnlyIntent,
sspiBlob: clientResponse
sspiBlob: clientResponse,
language: this.config.options.language
});

this.routingData = undefined;
Expand Down Expand Up @@ -890,10 +983,34 @@ class Connection extends EventEmitter {
}

getInitialSql() {
const xact_abort = this.config.options.abortTransactionOnError ? 'on' : 'off';
const enableAnsiNull = this.config.options.enableAnsiNull ? 'on' : 'off';
const enableAnsiNullDefault = this.config.options.enableAnsiNullDefault ? 'on' : 'off';
const enableAnsiPadding = this.config.options.enableAnsiPadding ? 'on' : 'off';
const enableAnsiWarnings = this.config.options.enableAnsiWarnings ? 'on' : 'off';
const enableArithAbort = this.config.options.enableArithAbort ? 'on' : 'off';
return 'set textsize ' + this.config.options.textsize + '\nset quoted_identifier on\nset arithabort ' + enableArithAbort + '\nset numeric_roundabort off\nset ansi_warnings on\nset ansi_padding on\nset ansi_nulls on\nset ansi_null_dflt_on ' + enableAnsiNullDefault + '\nset concat_null_yields_null on\nset cursor_close_on_commit off\nset implicit_transactions off\nset language us_english\nset dateformat mdy\nset datefirst ' + this.config.options.datefirst + '\nset transaction isolation level ' + (this.getIsolationLevelText(this.config.options.connectionIsolationLevel)) + '\nset xact_abort ' + xact_abort;
const enableConcatNullYieldsNull = this.config.options.enableConcatNullYieldsNull ? 'on' : 'off';
const enableCursorCloseOnCommit = this.config.options.enableCursorCloseOnCommit ? 'on' : 'off';
const enableImplicitTransactions = this.config.options.enableImplicitTransactions ? 'on' : 'off';
const enableNumericRoundabort = this.config.options.enableNumericRoundabort ? 'on' : 'off';
const enableQuotedIdentifier = this.config.options.enableQuotedIdentifier ? 'on' : 'off';
const xact_abort = this.config.options.abortTransactionOnError ? 'on' : 'off';

return `set ansi_nulls ${enableAnsiNull}\n
set ansi_null_dflt_on ${enableAnsiNullDefault}\n
set ansi_padding ${enableAnsiPadding}\n
set ansi_warnings ${enableAnsiWarnings}\n
set arithabort ${enableArithAbort}\n
set concat_null_yields_null ${enableConcatNullYieldsNull}\n
set cursor_close_on_commit ${enableCursorCloseOnCommit}\n
set datefirst ${this.config.options.datefirst}\n
set dateformat ${this.config.options.dateFormat}\n
set implicit_transactions ${enableImplicitTransactions}\n
set language ${this.config.options.language}\n
set numeric_roundabort ${enableNumericRoundabort}\n
set quoted_identifier ${enableQuotedIdentifier}\n
set textsize ${this.config.options.textsize}\n
set transaction isolation level ${this.getIsolationLevelText(this.config.options.connectionIsolationLevel)}\n
set xact_abort ${xact_abort}`;
}

processedInitialSql() {
Expand Down
Loading