Merge pull request #36 from 2Toad/1.5.0

1.5.0

Author: JasonPierce

.eslintrc

@@ -87,7 +87,6 @@
         "lines-around-directive": "error",
         "max-depth": "error",
         "max-len": "off",
-        "max-lines": "error",
         "max-nested-callbacks": "error",
         "max-params": "error",
         "max-statements": "error",
@@ -204,7 +203,6 @@
         "padded-blocks": "off",
         "prefer-arrow-callback": "off",
         "prefer-const": "error",
-        "prefer-destructuring": "error",
         "prefer-numeric-literals": "error",
         "prefer-promise-reject-errors": "error",
         "prefer-reflect": "off",

.travis.yml

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

README.md

@@ -95,6 +95,8 @@ return teradata.write(sql)
 ```
 
 #### Read Prepared Statement
+
+##### Anonymous Parameters
 ```js
 var id = 7;
 var sql = 'SELECT * FROM MyDatabase.MyTable WHERE Id = ?';
@@ -107,7 +109,22 @@ return teradata.readPreparedStatement(sql, [
   });
 ```
 
+##### Named Parameters
+```js
+var id = 7;
+var sql = 'SELECT * FROM MyDatabase.MyTable WHERE Id = :id';
+
+return teradata.readPreparedStatement(sql, [
+    teradata.createPreparedStatementParam('id', 'Int', Number(id))
+  ])
+  .then(function(response) {
+    console.log(response);
+  });
+```
+
 #### Write Prepared Statement
+
+##### Anonymous Parameters
 ```js
 var id = 7;
 var username = 'Foo';
@@ -121,3 +138,23 @@ return teradata.writePreparedStatement(sql, [
     console.log(count);
   });
 ```
+
+##### Named Parameters
+
+```js
+var id = 7;
+var username = 'Foo';
+var sql = 'UPDATE MyDatabase.MyTable SET Username = :username WHERE Id = :id';
+
+return teradata.writePreparedStatement(sql, [
+    teradata.createPreparedStatementParam('id', 'Int', Number(id)),
+    teradata.createPreparedStatementParam('username', 'String', username)
+  ])
+  .then(function(count) {
+    console.log(count);
+  });
+```
+
+---
+
+See the [docs](https://github.com/2Toad/node-teradata/tree/master/docs) for more information

index.js

@@ -3,7 +3,7 @@
  * Copyright (c) 2017 2Toad, LLC
  * https://github.com/2Toad/node-teradata
  *
- * Version: 1.4.0
+ * Version: 1.5.0
  * License: MIT
  */
 

lib/logger.js

@@ -3,7 +3,7 @@
  * Copyright (c) 2017 2Toad, LLC
  * https://github.com/2Toad/node-teradata
  *
- * Version: 1.4.0
+ * Version: 1.5.0
  * License: MIT
  */
 

lib/teradata.js

@@ -3,7 +3,7 @@
  * Copyright (c) 2017 2Toad, LLC
  * https://github.com/2Toad/node-teradata
  *
- * Version: 1.4.0
+ * Version: 1.5.0
  * License: MIT
  */
 
@@ -17,6 +17,7 @@ function Teradata(config) {
   if (!config) throw new Error('Configuration required');
 
   this.connections = [];
+  this.namedParamsRegex = /:([^\W]+)/g;
   this.config = _.defaultsDeep(config, {
     driver: './jars/',
     minPoolSize: 1,
@@ -170,13 +171,15 @@ function createStatement(connection) {
 }
 
 function createPreparedStatement(sql, params) {
+  var parsed = parseNamedParameters.call(this, sql, params);
+
   return open.call(this)
     .then(function(connection) {
-      return connection.prepareStatementAsync(sql)
+      return connection.prepareStatementAsync(parsed.sql)
         .then(function(preparedStatement) {
           Promise.promisifyAll(preparedStatement);
 
-          return Promise.all(params.map(function(param) {
+          return Promise.all(parsed.params.map(function(param) {
             var setTypeAsync = 'set' + param.type + 'Async';
             if (!preparedStatement[setTypeAsync]) throw new Error('Invalid parameter type: ' + param.type);
 
@@ -193,6 +196,49 @@ function createPreparedStatement(sql, params) {
     });
 }
 
+function parseNamedParameters(sql, params) {
+  var match;
+  var matches = [];
+  var parsed = {
+    sql: sql,
+    params: params
+  };
+
+  while ((match = this.namedParamsRegex.exec(sql)) !== null) {
+    matches.push(match[1]);
+  }
+
+  if (!hasNamedParameters(params) && !matches.length) return parsed;
+
+  parsed.params = [];
+
+  _.each(matches, function(match, index) {
+    var filtered = _.filter(params, {'index': match});
+    if (filtered.length > 1) throw new Error('Duplicate named parameter: ' + match);
+
+    var param = filtered[0];
+    if (!param) throw new Error('Missing named parameter: ' + match);
+
+    param.index = index + 1;
+    parsed.params.push(param);
+
+    parsed.sql = parsed.sql.replace(':' + match, '?');
+  });
+
+  return parsed;
+}
+
+function hasNamedParameters(params) {
+  var namedParams = _.filter(params, function(param) {
+    return typeof param.index === 'string';
+  });
+
+  if (!namedParams.length) return false;
+  if (namedParams.length !== params.length) throw new Error('Mixed anonymous and named parameters');
+
+  return true;
+}
+
 function open() {
   var connection;