Merge pull request #53 from 2Toad/1.6.0

1.6.0

Author: JasonPierce

.gitignore

@@ -9,6 +9,10 @@ pids
 *.seed
 *.pid.lock
 
+# IntelliJ/Webstorm
+*.iml
+.idea/
+
 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov
 

.travis.yml

@@ -1,7 +1,5 @@
 language: node_js
 node_js:
-  - "8"
-  - "7"
-  - "6"
-cache: yarn
-script: yarn lint
+  - 8
+  - 7
+  - 6

README.md

@@ -66,7 +66,8 @@ var config = {
     interval: 60000,
     query: 'SELECT 1',
     enabled: true
-  }
+  },
+  jvmOptions: ['-Xrs']
 };
 ```
 

docs/config.md

@@ -13,6 +13,7 @@ The node-teradata constructor requires a config object:
 | maxPoolSize | number | When a connection is requested, and the pool is empty, a new connection will be added to the pool until this number is reached | 100       |
 | keepalive   | object | (see [keepAlive Properties](#keepalive-properties))                                                                            | ---       |
 | logger      | object | (see [logger Properties](#logger-properties))                                                                                  | ---       |
+| jvmOptions  | array  | An array of strings of jvm options (Your array will not be merged with the default array, it will replace it)                  | ['-Xrs']  |
 
 ### keepalive Properties
 | Property | Type    | Details                                             | Default       |
@@ -44,6 +45,7 @@ var config = {
   },
   logger: {
     level: 'debug'
-  }
+  },
+  jvmOptions: ['-Xrs']
 };
 ```

lib/teradata.js

@@ -29,7 +29,8 @@ function Teradata(config) {
     },
     logger: {
       level: 'error'
-    }
+    },
+    jvmOptions: ['-Xrs']
   });
 
   log.init(this.config.logger);
@@ -216,7 +217,7 @@ function parseNamedParameters(sql, params) {
     var filtered = _.filter(params, {'index': match});
     if (filtered.length > 1) throw new Error('Duplicate named parameter: ' + match);
 
-    var param = filtered[0];
+    var param = _.clone(filtered[0]);
     if (!param) throw new Error('Missing named parameter: ' + match);
 
     param.index = index + 1;
@@ -278,7 +279,9 @@ function initialize() {
   if (this.initialized) return Promise.resolve(this.pool);
 
   if (!jinst.isJvmCreated()) {
-    jinst.addOption('-Xrs');
+    this.config.jvmOptions.forEach(function(opt) {
+      jinst.addOption(opt);
+    });
     jinst.setupClasspath([
       this.config.driver + 'terajdbc4.jar',
       this.config.driver + 'tdgssconfig.jar'