tedious 1.12.3 → 1.14.0

package/lib/token/colmetadata-token-parser.js

@@ -1,118 +1,59 @@
-var _regeneratorRuntime = require('babel-runtime/regenerator').default;
+'use strict';
 
-// Generated by CoffeeScript 1.10.0
-var metadataParse;
+var metadataParse = require('../metadata-parser');
 
-metadataParse = require('../metadata-parser');
+function readTableName(parser, options, metadata, callback) {
+  if (metadata.type.hasTableName) {
+    if (options.tdsVersion >= '7_2') {
+      parser.readUInt8(function (numberOfTableNameParts) {
+        var tableName = [];
 
-module.exports = _regeneratorRuntime.mark(function callee$0$0(parser, colMetadata, options) {
-  var c, colName, columnCount, columns, i, metadata, numberOfTableNameParts, part, ref, tableName;
-  return _regeneratorRuntime.wrap(function callee$0$0$(context$1$0) {
-    while (1) switch (context$1$0.prev = context$1$0.next) {
-      case 0:
-        context$1$0.next = 2;
-        return parser.readUInt16LE();
+        var i = 0;
+        function next(done) {
+          if (numberOfTableNameParts === i) {
+            return done();
+          }
 
-      case 2:
-        columnCount = context$1$0.sent;
+          parser.readUsVarChar(function (part) {
+            tableName.push(part);
 
-        columns = [];
-        c = i = 0, ref = columnCount;
+            i++;
 
-      case 5:
-        if (!(0 <= ref ? i < ref : i > ref)) {
-          context$1$0.next = 29;
-          break;
-        }
-
-        return context$1$0.delegateYield(metadataParse(parser, options), 't0', 7);
-
-      case 7:
-        metadata = context$1$0.t0;
-
-        if (!metadata.type.hasTableName) {
-          context$1$0.next = 21;
-          break;
-        }
-
-        if (!(options.tdsVersion >= '7_2')) {
-          context$1$0.next = 17;
-          break;
-        }
-
-        context$1$0.next = 12;
-        return parser.readUInt8();
-
-      case 12:
-        numberOfTableNameParts = context$1$0.sent;
-        return context$1$0.delegateYield(_regeneratorRuntime.mark(function callee$1$0() {
-          var j, ref1, results;
-          return _regeneratorRuntime.wrap(function callee$1$0$(context$2$0) {
-            while (1) switch (context$2$0.prev = context$2$0.next) {
-              case 0:
-                results = [];
-                part = j = 1, ref1 = numberOfTableNameParts;
-
-              case 2:
-                if (!(1 <= ref1 ? j <= ref1 : j >= ref1)) {
-                  context$2$0.next = 10;
-                  break;
-                }
-
-                context$2$0.t0 = results;
-                return context$2$0.delegateYield(parser.readUsVarChar(), 't1', 5);
-
-              case 5:
-                context$2$0.t2 = context$2$0.t1;
-                context$2$0.t0.push.call(context$2$0.t0, context$2$0.t2);
-
-              case 7:
-                part = 1 <= ref1 ? ++j : --j;
-                context$2$0.next = 2;
-                break;
-
-              case 10:
-                return context$2$0.abrupt('return', results);
-
-              case 11:
-              case 'end':
-                return context$2$0.stop();
-            }
-          }, callee$1$0, this);
-        })(), 't1', 14);
-
-      case 14:
-        tableName = context$1$0.t1;
-        context$1$0.next = 19;
-        break;
-
-      case 17:
-        return context$1$0.delegateYield(parser.readUsVarChar(), 't2', 18);
-
-      case 18:
-        tableName = context$1$0.t2;
-
-      case 19:
-        context$1$0.next = 22;
-        break;
-
-      case 21:
-        tableName = void 0;
-
-      case 22:
-        return context$1$0.delegateYield(parser.readBVarChar(), 't3', 23);
-
-      case 23:
-        colName = context$1$0.t3;
-
-        if (options.columnNameReplacer) {
-          colName = options.columnNameReplacer(colName, c, metadata);
-        } else if (options.camelCaseColumns) {
-          colName = colName.replace(/^[A-Z]/, function (s) {
-            return s.toLowerCase();
+            next(done);
           });
         }
-        columns.push({
+
+        next(function () {
+          callback(tableName);
+        });
+      });
+    } else {
+      parser.readUsVarChar(callback);
+    }
+  } else {
+    callback(undefined);
+  }
+}
+
+function readColumnName(parser, options, index, metadata, callback) {
+  parser.readBVarChar(function (colName) {
+    if (options.columnNameReplacer) {
+      callback(options.columnNameReplacer(colName, index, metadata));
+    } else if (options.camelCaseColumns) {
+      callback(colName.replace(/^[A-Z]/, function (s) {
+        return s.toLowerCase();
+      }));
+    } else {
+      callback(colName);
+    }
+  });
+}
+
+function readColumn(parser, options, index, callback) {
+  metadataParse(parser, options, function (metadata) {
+    readTableName(parser, options, metadata, function (tableName) {
+      readColumnName(parser, options, index, metadata, function (colName) {
+        callback({
           userType: metadata.userType,
           flags: metadata.flags,
           type: metadata.type,
@@ -124,22 +65,35 @@ module.exports = _regeneratorRuntime.mark(function callee$0$0(parser, colMetadat
           dataLength: metadata.dataLength,
           tableName: tableName
         });
-
-      case 26:
-        c = 0 <= ref ? ++i : --i;
-        context$1$0.next = 5;
-        break;
-
-      case 29:
-        return context$1$0.abrupt('return', {
-          name: 'COLMETADATA',
-          event: 'columnMetadata',
-          columns: columns
-        });
-
-      case 30:
-      case 'end':
-        return context$1$0.stop();
+      });
+    });
+  });
+}
+
+module.exports = function (parser, colMetadata, options, callback) {
+  parser.readUInt16LE(function (columnCount) {
+    var columns = [];
+
+    var i = 0;
+    function next(done) {
+      if (i === columnCount) {
+        return done();
+      }
+
+      readColumn(parser, options, i, function (column) {
+        columns.push(column);
+
+        i++;
+        next(done);
+      });
     }
-  }, callee$0$0, this);
-});
+
+    next(function () {
+      callback({
+        name: 'COLMETADATA',
+        event: 'columnMetadata',
+        columns: columns
+      });
+    });
+  });
+};

package/lib/token/done-token-parser.js

@@ -1,147 +1,65 @@
-var _regeneratorRuntime = require('babel-runtime/regenerator').default;
+'use strict';
 
-// Generated by CoffeeScript 1.10.0
-var STATUS, doneInProcParser, doneParser, doneProcParser, parseToken;
+// s2.2.7.5/6/7
 
-STATUS = {
+var STATUS = {
   MORE: 0x0001,
   ERROR: 0x0002,
+  // This bit is not yet in use by SQL Server, so is not exposed in the returned token
   INXACT: 0x0004,
   COUNT: 0x0010,
   ATTN: 0x0020,
   SRVERROR: 0x0100
 };
 
-parseToken = _regeneratorRuntime.mark(function callee$0$0(parser, options) {
-  var attention, curCmd, inTxn, more, rowCount, rowCountValid, serverError, sqlError, status, token;
-  return _regeneratorRuntime.wrap(function callee$0$0$(context$1$0) {
-    while (1) switch (context$1$0.prev = context$1$0.next) {
-      case 0:
-        context$1$0.next = 2;
-        return parser.readUInt16LE();
-
-      case 2:
-        status = context$1$0.sent;
-
-        more = !!(status & STATUS.MORE);
-        sqlError = !!(status & STATUS.ERROR);
-        inTxn = !!(status & STATUS.INXACT);
-        rowCountValid = !!(status & STATUS.COUNT);
-        attention = !!(status & STATUS.ATTN);
-        serverError = !!(status & STATUS.SRVERROR);
-        context$1$0.next = 11;
-        return parser.readUInt16LE();
-
-      case 11:
-        curCmd = context$1$0.sent;
-
-        if (!(options.tdsVersion < "7_2")) {
-          context$1$0.next = 18;
-          break;
-        }
-
-        context$1$0.next = 15;
-        return parser.readUInt32LE();
-
-      case 15:
-        rowCount = context$1$0.sent;
-        context$1$0.next = 21;
-        break;
-
-      case 18:
-        context$1$0.next = 20;
-        return parser.readUInt64LE();
-
-      case 20:
-        rowCount = context$1$0.sent;
-
-      case 21:
-        if (!rowCountValid) {
-          rowCount = void 0;
-        }
-        return context$1$0.abrupt('return', token = {
+function parseToken(parser, options, callback) {
+  parser.readUInt16LE(function (status) {
+    var more = !!(status & STATUS.MORE);
+    var sqlError = !!(status & STATUS.ERROR);
+    var rowCountValid = !!(status & STATUS.COUNT);
+    var attention = !!(status & STATUS.ATTN);
+    var serverError = !!(status & STATUS.SRVERROR);
+
+    parser.readUInt16LE(function (curCmd) {
+      (options.tdsVersion < '7_2' ? parser.readUInt32LE : parser.readUInt64LE).call(parser, function (rowCount) {
+        callback({
           name: 'DONE',
           event: 'done',
           more: more,
           sqlError: sqlError,
           attention: attention,
           serverError: serverError,
-          rowCount: rowCount,
+          rowCount: rowCountValid ? rowCount : undefined,
           curCmd: curCmd
         });
-
-      case 23:
-      case 'end':
-        return context$1$0.stop();
-    }
-  }, callee$0$0, this);
-});
-
-doneParser = _regeneratorRuntime.mark(function callee$0$0(parser, colMetadata, options) {
-  var token;
-  return _regeneratorRuntime.wrap(function callee$0$0$(context$1$0) {
-    while (1) switch (context$1$0.prev = context$1$0.next) {
-      case 0:
-        return context$1$0.delegateYield(parseToken(parser, options), 't0', 1);
-
-      case 1:
-        token = context$1$0.t0;
-
-        token.name = 'DONE';
-        token.event = 'done';
-        return context$1$0.abrupt('return', token);
-
-      case 5:
-      case 'end':
-        return context$1$0.stop();
-    }
-  }, callee$0$0, this);
-});
-
-doneInProcParser = _regeneratorRuntime.mark(function callee$0$0(parser, colMetadata, options) {
-  var token;
-  return _regeneratorRuntime.wrap(function callee$0$0$(context$1$0) {
-    while (1) switch (context$1$0.prev = context$1$0.next) {
-      case 0:
-        return context$1$0.delegateYield(parseToken(parser, options), 't0', 1);
-
-      case 1:
-        token = context$1$0.t0;
-
-        token.name = 'DONEINPROC';
-        token.event = 'doneInProc';
-        return context$1$0.abrupt('return', token);
-
-      case 5:
-      case 'end':
-        return context$1$0.stop();
-    }
-  }, callee$0$0, this);
-});
-
-doneProcParser = _regeneratorRuntime.mark(function callee$0$0(parser, colMetadata, options) {
-  var token;
-  return _regeneratorRuntime.wrap(function callee$0$0$(context$1$0) {
-    while (1) switch (context$1$0.prev = context$1$0.next) {
-      case 0:
-        return context$1$0.delegateYield(parseToken(parser, options), 't0', 1);
-
-      case 1:
-        token = context$1$0.t0;
-
-        token.name = 'DONEPROC';
-        token.event = 'doneProc';
-        return context$1$0.abrupt('return', token);
-
-      case 5:
-      case 'end':
-        return context$1$0.stop();
-    }
-  }, callee$0$0, this);
-});
-
-exports.doneParser = doneParser;
-
-exports.doneInProcParser = doneInProcParser;
-
-exports.doneProcParser = doneProcParser;
+      });
+    });
+  });
+}
+
+module.exports.doneParser = doneParser;
+function doneParser(parser, colMetadata, options, callback) {
+  parseToken(parser, options, function (token) {
+    token.name = 'DONE';
+    token.event = 'done';
+    callback(token);
+  });
+}
+
+module.exports.doneInProcParser = doneInProcParser;
+function doneInProcParser(parser, colMetadata, options, callback) {
+  parseToken(parser, options, function (token) {
+    token.name = 'DONEINPROC';
+    token.event = 'doneInProc';
+    callback(token);
+  });
+}
+
+module.exports.doneProcParser = doneProcParser;
+function doneProcParser(parser, colMetadata, options, callback) {
+  parseToken(parser, options, function (token) {
+    token.name = 'DONEPROC';
+    token.event = 'doneProc';
+    callback(token);
+  });
+}

package/lib/token/env-change-token-parser.js

@@ -1,9 +1,6 @@
-var _regeneratorRuntime = require('babel-runtime/regenerator').default;
+'use strict';
 
-// Generated by CoffeeScript 1.10.0
-var types;
-
-types = {
+var types = {
   1: {
     name: 'DATABASE',
     event: 'databaseChange'
@@ -53,133 +50,100 @@ types = {
   }
 };
 
-module.exports = _regeneratorRuntime.mark(function callee$0$0(parser) {
-  var length, newValue, oldValue, port, protocol, routePacket, server, serverLen, type, typeNumber, valueLength;
-  return _regeneratorRuntime.wrap(function callee$0$0$(context$1$0) {
-    while (1) switch (context$1$0.prev = context$1$0.next) {
-      case 0:
-        context$1$0.next = 2;
-        return parser.readUInt16LE();
-
-      case 2:
-        length = context$1$0.sent;
-        context$1$0.next = 5;
-        return parser.readUInt8();
-
-      case 5:
-        typeNumber = context$1$0.sent;
-
-        type = types[typeNumber];
-
-        if (!type) {
-          context$1$0.next = 48;
-          break;
-        }
-
-        context$1$0.t0 = type.name;
-        context$1$0.next = context$1$0.t0 === 'DATABASE' ? 11 : context$1$0.t0 === 'LANGUAGE' ? 11 : context$1$0.t0 === 'CHARSET' ? 11 : context$1$0.t0 === 'PACKET_SIZE' ? 11 : context$1$0.t0 === 'DATABASE_MIRRORING_PARTNER' ? 11 : context$1$0.t0 === 'SQL_COLLATION' ? 16 : context$1$0.t0 === 'BEGIN_TXN' ? 16 : context$1$0.t0 === 'COMMIT_TXN' ? 16 : context$1$0.t0 === 'ROLLBACK_TXN' ? 16 : context$1$0.t0 === 'RESET_CONNECTION' ? 16 : context$1$0.t0 === 'ROUTING_CHANGE' ? 21 : 41;
-        break;
-
-      case 11:
-        return context$1$0.delegateYield(parser.readBVarChar(), 't1', 12);
-
-      case 12:
-        newValue = context$1$0.t1;
-        return context$1$0.delegateYield(parser.readBVarChar(), 't2', 14);
-
-      case 14:
-        oldValue = context$1$0.t2;
-        return context$1$0.abrupt('break', 45);
-
-      case 16:
-        return context$1$0.delegateYield(parser.readBVarByte(), 't3', 17);
-
-      case 17:
-        newValue = context$1$0.t3;
-        return context$1$0.delegateYield(parser.readBVarByte(), 't4', 19);
-
-      case 19:
-        oldValue = context$1$0.t4;
-        return context$1$0.abrupt('break', 45);
-
-      case 21:
-        context$1$0.next = 23;
-        return parser.readUInt16LE();
-
-      case 23:
-        valueLength = context$1$0.sent;
-        context$1$0.next = 26;
-        return parser.readBuffer(valueLength);
-
-      case 26:
-        routePacket = context$1$0.sent;
-
-        protocol = routePacket.readUInt8(0);
-
-        if (!(protocol !== 0)) {
-          context$1$0.next = 30;
-          break;
-        }
-
-        throw new Error('Unknown protocol byte in routing change event');
-
-      case 30:
-        port = routePacket.readUInt16LE(1);
-        serverLen = routePacket.readUInt16LE(3);
-        server = routePacket.toString('ucs2', 5, 5 + serverLen * 2);
-        newValue = {
-          protocol: protocol,
-          port: port,
-          server: server
-        };
-        context$1$0.next = 36;
-        return parser.readUInt16LE();
-
-      case 36:
-        valueLength = context$1$0.sent;
-        context$1$0.next = 39;
-        return parser.readBuffer(valueLength);
-
-      case 39:
-        oldValue = context$1$0.sent;
-        return context$1$0.abrupt('break', 45);
-
-      case 41:
-        console.error("Tedious > Unsupported ENVCHANGE type " + typeNumber);
-        context$1$0.next = 44;
-        return parser.readBuffer(length - 1);
-
-      case 44:
-        return context$1$0.abrupt('return');
-
-      case 45:
-        if (type.name === 'PACKET_SIZE') {
-          newValue = parseInt(newValue);
-          oldValue = parseInt(oldValue);
-        }
-        context$1$0.next = 52;
-        break;
+function readNewAndOldValue(parser, length, type, callback) {
+  switch (type.name) {
+    case 'DATABASE':
+    case 'LANGUAGE':
+    case 'CHARSET':
+    case 'PACKET_SIZE':
+    case 'DATABASE_MIRRORING_PARTNER':
+      return parser.readBVarChar(function (newValue) {
+        parser.readBVarChar(function (oldValue) {
+          if (type.name === 'PACKET_SIZE') {
+            callback(parseInt(newValue), parseInt(oldValue));
+          } else {
+            callback(newValue, oldValue);
+          }
+        });
+      });
+
+    case 'SQL_COLLATION':
+    case 'BEGIN_TXN':
+    case 'COMMIT_TXN':
+    case 'ROLLBACK_TXN':
+    case 'RESET_CONNECTION':
+      return parser.readBVarByte(function (newValue) {
+        parser.readBVarByte(function (oldValue) {
+          callback(newValue, oldValue);
+        });
+      });
+
+    case 'ROUTING_CHANGE':
+      parser.readUInt16LE(function (valueLength) {
+        // Routing Change:
+        // Byte 1: Protocol (must be 0)
+        // Bytes 2-3 (USHORT): Port number
+        // Bytes 4-5 (USHORT): Length of server data in unicode (2byte chars)
+        // Bytes 6-*: Server name in unicode characters
+        parser.readBuffer(valueLength, function (routePacket) {
+          var protocol = routePacket.readUInt8(0);
+
+          if (protocol !== 0) {
+            return parser.emit('error', new Error('Unknown protocol byte in routing change event'));
+          }
+
+          var port = routePacket.readUInt16LE(1);
+          var serverLen = routePacket.readUInt16LE(3);
+          // 2 bytes per char, starting at offset 5
+          var server = routePacket.toString('ucs2', 5, 5 + serverLen * 2);
+
+          var newValue = {
+            protocol: protocol,
+            port: port,
+            server: server
+          };
+
+          parser.readUInt16LE(function (oldValueLength) {
+            parser.readBuffer(oldValueLength, function (oldValue) {
+              callback(newValue, oldValue);
+            });
+          });
+        });
+      });
 
-      case 48:
-        console.error("Tedious > Unsupported ENVCHANGE type " + typeNumber);
-        context$1$0.next = 51;
-        return parser.readBuffer(length - 1);
+      break;
 
-      case 51:
-        return context$1$0.abrupt('return');
+    default:
+      console.error('Tedious > Unsupported ENVCHANGE type ' + type.name);
+      // skip unknown bytes
+      parser.readBuffer(length - 1, function () {
+        callback(undefined, undefined);
+      });
+  }
+}
+
+module.exports = function (parser, colMetadata, options, callback) {
+  parser.readUInt16LE(function (length) {
+    parser.readUInt8(function (typeNumber) {
+      var type = types[typeNumber];
+
+      if (!type) {
+        console.error('Tedious > Unsupported ENVCHANGE type ' + typeNumber);
+        // skip unknown bytes
+        return parser.readBuffer(length - 1, function () {
+          callback();
+        });
+      }
 
-      case 52:
-        return context$1$0.abrupt('return', {
+      readNewAndOldValue(parser, length, type, function (newValue, oldValue) {
+        callback({
           name: 'ENVCHANGE',
           type: type.name,
           event: type.event,
           oldValue: oldValue,
           newValue: newValue
         });
-
-      case 53:
-      case 'end':
-        return context$1$0.stop();
-    }
-  }, callee$0$0, this);
-});
+      });
+    });
+  });
+};