tedious 1.13.2 → 1.14.0

package/lib/tracking-buffer/bigint.js

@@ -1,10 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', {
-  value: true
-});
-exports.convertLEBytesToString = convertLEBytesToString;
-exports.numberToInt64LE = numberToInt64LE;
 function isZero(array) {
   for (var j = 0, len = array.length; j < len; j++) {
     var byte = array[j];
@@ -46,6 +41,7 @@ function invert(array) {
   }
 }
 
+module.exports.convertLEBytesToString = convertLEBytesToString;
 function convertLEBytesToString(buffer) {
   var array = Array.prototype.slice.call(buffer, 0, buffer.length);
   if (isZero(array)) {
@@ -67,6 +63,7 @@ function convertLEBytesToString(buffer) {
   }
 }
 
+module.exports.numberToInt64LE = numberToInt64LE;
 function numberToInt64LE(num) {
   // adapted from https://github.com/broofa/node-int64
   var negate = num < 0;

package/lib/tracking-buffer/readable-tracking-buffer.js

@@ -4,11 +4,7 @@ var _createClass = require('babel-runtime/helpers/create-class')['default'];
 
 var _classCallCheck = require('babel-runtime/helpers/class-call-check')['default'];
 
-Object.defineProperty(exports, '__esModule', {
-  value: true
-});
-
-var _bigint = require('./bigint');
+var convertLEBytesToString = require('./bigint').convertLEBytesToString;
 
 /*
   A Buffer-like class that tracks position.
@@ -17,7 +13,7 @@ var _bigint = require('./bigint');
   When reading, if the read would pass the end of the buffer, an error object is thrown.
  */
 
-var ReadableTrackingBuffer = (function () {
+module.exports = (function () {
   function ReadableTrackingBuffer(buffer, encoding) {
     _classCallCheck(this, ReadableTrackingBuffer);
 
@@ -43,7 +39,7 @@ var ReadableTrackingBuffer = (function () {
       this.previousPosition = this.position;
       var available = this.buffer.length - this.position;
       if (available < lengthRequired) {
-        var e = new Error("required : " + lengthRequired + ", available : " + available);
+        var e = new Error('required : ' + lengthRequired + ', available : ' + available);
         e.code = 'oob';
         throw e;
       }
@@ -180,7 +176,7 @@ var ReadableTrackingBuffer = (function () {
       var low = this.readUInt32LE();
       var high = this.readUInt32LE();
       if (high >= 2 << 53 - 32) {
-        console.warn("Read UInt64LE > 53 bits : high=" + high + ", low=" + low);
+        console.warn('Read UInt64LE > 53 bits : high=' + high + ', low=' + low);
       }
       return low + 0x100000000 * high;
     }
@@ -249,7 +245,7 @@ var ReadableTrackingBuffer = (function () {
     value: function readAsStringBigIntLE(length) {
       this.assertEnoughLeftFor(length);
       this.position += length;
-      return (0, _bigint.convertLEBytesToString)(this.buffer.slice(this.position - length, this.position));
+      return convertLEBytesToString(this.buffer.slice(this.position - length, this.position));
     }
   }, {
     key: 'readAsStringInt64LE',
@@ -259,7 +255,4 @@ var ReadableTrackingBuffer = (function () {
   }]);
 
   return ReadableTrackingBuffer;
-})();
-
-exports['default'] = ReadableTrackingBuffer;
-module.exports = exports['default'];
+})();

package/lib/tracking-buffer/tracking-buffer.js

@@ -1,18 +1,4 @@
 'use strict';
 
-var _interopRequireDefault = require('babel-runtime/helpers/interop-require-default')['default'];
-
-Object.defineProperty(exports, '__esModule', {
-  value: true
-});
-
-var _readableTrackingBuffer = require('./readable-tracking-buffer');
-
-var _readableTrackingBuffer2 = _interopRequireDefault(_readableTrackingBuffer);
-
-var _writableTrackingBuffer = require('./writable-tracking-buffer');
-
-var _writableTrackingBuffer2 = _interopRequireDefault(_writableTrackingBuffer);
-
-exports.ReadableTrackingBuffer = _readableTrackingBuffer2['default'];
-exports.WritableTrackingBuffer = _writableTrackingBuffer2['default'];
+module.exports.ReadableTrackingBuffer = require('./readable-tracking-buffer');
+module.exports.WritableTrackingBuffer = require('./writable-tracking-buffer');

package/lib/tracking-buffer/writable-tracking-buffer.js

@@ -4,15 +4,7 @@ var _createClass = require('babel-runtime/helpers/create-class')['default'];
 
 var _classCallCheck = require('babel-runtime/helpers/class-call-check')['default'];
 
-var _interopRequireWildcard = require('babel-runtime/helpers/interop-require-wildcard')['default'];
-
-Object.defineProperty(exports, '__esModule', {
-  value: true
-});
-
-var _bigint = require('./bigint');
-
-var bigint = _interopRequireWildcard(_bigint);
+var bigint = require('./bigint');
 
 require('../buffertools');
 
@@ -26,8 +18,7 @@ var UNKNOWN_PLP_LEN = new Buffer([0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
   As values are written, the position advances by the size of the written data.
   When writing, automatically allocates new buffers if there's not enough space.
  */
-
-var WritableTrackingBuffer = (function () {
+module.exports = (function () {
   function WritableTrackingBuffer(initialSize, encoding, doubleSizeGrowth) {
     _classCallCheck(this, WritableTrackingBuffer);
 
@@ -322,7 +313,4 @@ var WritableTrackingBuffer = (function () {
   }]);
 
   return WritableTrackingBuffer;
-})();
-
-exports['default'] = WritableTrackingBuffer;
-module.exports = exports['default'];
+})();

package/lib/transaction.js

@@ -4,9 +4,6 @@ var _createClass = require('babel-runtime/helpers/create-class')['default'];
 
 var _classCallCheck = require('babel-runtime/helpers/class-call-check')['default'];
 
-Object.defineProperty(exports, '__esModule', {
-  value: true
-});
 var WritableTrackingBuffer = require('./tracking-buffer/writable-tracking-buffer');
 var writeAllHeaders = require('./all-headers').writeToTrackingBuffer;
 
@@ -14,7 +11,7 @@ var writeAllHeaders = require('./all-headers').writeToTrackingBuffer;
   s2.2.6.8
  */
 
-var OPERATION_TYPE = {
+var OPERATION_TYPE = module.exports.OPERATION_TYPE = {
   TM_GET_DTC_ADDRESS: 0x00,
   TM_PROPAGATE_XACT: 0x01,
   TM_BEGIN_XACT: 0x05,
@@ -24,8 +21,7 @@ var OPERATION_TYPE = {
   TM_SAVE_XACT: 0x09
 };
 
-exports.OPERATION_TYPE = OPERATION_TYPE;
-var ISOLATION_LEVEL = {
+var ISOLATION_LEVEL = module.exports.ISOLATION_LEVEL = {
   NO_CHANGE: 0x00,
   READ_UNCOMMITTED: 0x01,
   READ_COMMITTED: 0x02,
@@ -34,7 +30,6 @@ var ISOLATION_LEVEL = {
   SNAPSHOT: 0x05
 };
 
-exports.ISOLATION_LEVEL = ISOLATION_LEVEL;
 var isolationLevelByValue = {};
 for (var _name in ISOLATION_LEVEL) {
   var value = ISOLATION_LEVEL[_name];
@@ -65,7 +60,7 @@ var Transaction = (function () {
       return {
         data: buffer.data,
         toString: function toString() {
-          return "Begin Transaction: name=" + _this.name + ", isolationLevel=" + isolationLevelByValue[_this.isolationLevel];
+          return 'Begin Transaction: name=' + _this.name + ', isolationLevel=' + isolationLevelByValue[_this.isolationLevel];
         }
       };
     }
@@ -85,7 +80,7 @@ var Transaction = (function () {
       return {
         data: buffer.data,
         toString: function toString() {
-          return "Commit Transaction: name=" + _this2.name;
+          return 'Commit Transaction: name=' + _this2.name;
         }
       };
     }
@@ -105,7 +100,7 @@ var Transaction = (function () {
       return {
         data: buffer.data,
         toString: function toString() {
-          return "Rollback Transaction: name=" + _this3.name;
+          return 'Rollback Transaction: name=' + _this3.name;
         }
       };
     }
@@ -123,7 +118,7 @@ var Transaction = (function () {
       return {
         data: buffer.data,
         toString: function toString() {
-          return "Save Transaction: name=" + _this4.name;
+          return 'Save Transaction: name=' + _this4.name;
         }
       };
     }
@@ -149,4 +144,4 @@ var Transaction = (function () {
   return Transaction;
 })();
 
-exports.Transaction = Transaction;
+module.exports.Transaction = Transaction;

package/lib/value-parser.js

@@ -1,24 +1,14 @@
 'use strict';
 
-var _interopRequireDefault = require('babel-runtime/helpers/interop-require-default')['default'];
+var iconv = require('iconv-lite');
+var sprintf = require('sprintf').sprintf;
+var TYPE = require('./data-type').TYPE;
+var guidParser = require('./guid-parser');
 
-var _interopRequireWildcard = require('babel-runtime/helpers/interop-require-wildcard')['default'];
-
-Object.defineProperty(exports, '__esModule', {
-  value: true
-});
-
-var _iconvLite = require('iconv-lite');
-
-var _iconvLite2 = _interopRequireDefault(_iconvLite);
-
-var _sprintf = require('sprintf');
-
-var _guidParser = require('./guid-parser');
-
-var guidParser = _interopRequireWildcard(_guidParser);
-
-var _trackingBufferBigint = require('./tracking-buffer/bigint');
+var readPrecision = require('./metadata-parser').readPrecision;
+var readScale = require('./metadata-parser').readScale;
+var readCollation = require('./metadata-parser').readCollation;
+var convertLEBytesToString = require('./tracking-buffer/bigint').convertLEBytesToString;
 
 var NULL = (1 << 16) - 1;
 var MAX = (1 << 16) - 1;
@@ -52,6 +42,10 @@ function readDataLength(parser, type, metaData, textPointerNull, callback) {
     return callback(0);
   }
 
+  if (metaData.isVariantValue) {
+    return callback(metaData.dataLength);
+  }
+
   // s2.2.4.2.1
   switch (type.id & 0x30) {
     case 0x10:
@@ -76,18 +70,20 @@ function readDataLength(parser, type, metaData, textPointerNull, callback) {
             return parser.readUInt32LE(callback);
 
           default:
-            return parser.emit('error', new Error("Unsupported dataLengthLength " + type.dataLengthLength + " for data type " + type.name));
+            return parser.emit('error', new Error('Unsupported dataLengthLength ' + type.dataLengthLength + ' for data type ' + type.name));
         }
       } else {
         return callback(undefined);
       }
+      break;
 
     case 0x30:
       return callback(1 << ((type.id & 0x0C) >> 2));
   }
 }
 
-exports['default'] = function (parser, metaData, options, callback) {
+module.exports = valueParse;
+function valueParse(parser, metaData, options, callback) {
   var type = metaData.type;
 
   readTextPointerNull(parser, type, function (textPointerNull) {
@@ -107,7 +103,7 @@ exports['default'] = function (parser, metaData, options, callback) {
 
         case 'BigInt':
           return parser.readBuffer(8, function (buffer) {
-            callback((0, _trackingBufferBigint.convertLEBytesToString)(buffer));
+            callback(convertLEBytesToString(buffer));
           });
 
         case 'IntN':
@@ -122,12 +118,13 @@ exports['default'] = function (parser, metaData, options, callback) {
               return parser.readInt32LE(callback);
             case 8:
               return parser.readBuffer(8, function (buffer) {
-                callback((0, _trackingBufferBigint.convertLEBytesToString)(buffer));
+                callback(convertLEBytesToString(buffer));
               });
 
             default:
-              return parser.emit('error', new Error("Unsupported dataLength " + dataLength + " for IntN"));
+              return parser.emit('error', new Error('Unsupported dataLength ' + dataLength + ' for IntN'));
           }
+          break;
 
         case 'Real':
           return parser.readFloatLE(callback);
@@ -145,8 +142,9 @@ exports['default'] = function (parser, metaData, options, callback) {
               return parser.readDoubleLE(callback);
 
             default:
-              return parser.emit('error', new Error("Unsupported dataLength " + dataLength + " for FloatN"));
+              return parser.emit('error', new Error('Unsupported dataLength ' + dataLength + ' for FloatN'));
           }
+          break;
 
         case 'Money':
         case 'SmallMoney':
@@ -166,8 +164,9 @@ exports['default'] = function (parser, metaData, options, callback) {
               });
 
             default:
-              return parser.emit('error', new Error("Unsupported dataLength " + dataLength + " for MoneyN"));
+              return parser.emit('error', new Error('Unsupported dataLength ' + dataLength + ' for MoneyN'));
           }
+          break;
 
         case 'Bit':
           return parser.readUInt8(function (value) {
@@ -183,6 +182,7 @@ exports['default'] = function (parser, metaData, options, callback) {
                 callback(!!value);
               });
           }
+          break;
 
         case 'VarChar':
         case 'Char':
@@ -192,6 +192,7 @@ exports['default'] = function (parser, metaData, options, callback) {
           } else {
             return readChars(parser, dataLength, codepage, callback);
           }
+          break;
 
         case 'NVarChar':
         case 'NChar':
@@ -200,6 +201,7 @@ exports['default'] = function (parser, metaData, options, callback) {
           } else {
             return readNChars(parser, dataLength, callback);
           }
+          break;
 
         case 'VarBinary':
         case 'Binary':
@@ -232,6 +234,7 @@ exports['default'] = function (parser, metaData, options, callback) {
           } else {
             return readBinary(parser, dataLength, callback);
           }
+          break;
 
         case 'Xml':
           return readMaxNChars(parser, callback);
@@ -251,42 +254,39 @@ exports['default'] = function (parser, metaData, options, callback) {
             case 8:
               return readDateTime(parser, options.useUTC, callback);
           }
+          break;
 
         case 'TimeN':
-          return parser.readUInt8(function (dataLength) {
-            if (dataLength === 0) {
-              return callback(null);
-            } else {
-              return readTime(parser, dataLength, metaData.scale, options.useUTC, callback);
-            }
-          });
+          if (dataLength === 0) {
+            return callback(null);
+          } else {
+            return readTime(parser, dataLength, metaData.scale, options.useUTC, callback);
+          }
+          break;
 
         case 'DateN':
-          return parser.readUInt8(function (dataLength) {
-            if (dataLength === 0) {
-              return callback(null);
-            } else {
-              return readDate(parser, options.useUTC, callback);
-            }
-          });
+          if (dataLength === 0) {
+            return callback(null);
+          } else {
+            return readDate(parser, options.useUTC, callback);
+          }
+          break;
 
         case 'DateTime2N':
-          return parser.readUInt8(function (dataLength) {
-            if (dataLength === 0) {
-              return callback(null);
-            } else {
-              return readDateTime2(parser, dataLength, metaData.scale, options.useUTC, callback);
-            }
-          });
+          if (dataLength === 0) {
+            return callback(null);
+          } else {
+            return readDateTime2(parser, dataLength, metaData.scale, options.useUTC, callback);
+          }
+          break;
 
         case 'DateTimeOffsetN':
-          return parser.readUInt8(function (dataLength) {
-            if (dataLength === 0) {
-              return callback(null);
-            } else {
-              return readDateTimeOffset(parser, dataLength, metaData.scale, callback);
-            }
-          });
+          if (dataLength === 0) {
+            return callback(null);
+          } else {
+            return readDateTimeOffset(parser, dataLength, metaData.scale, callback);
+          }
+          break;
 
         case 'NumericN':
         case 'DecimalN':
@@ -311,7 +311,7 @@ exports['default'] = function (parser, metaData, options, callback) {
                   readValue = parser.readUNumeric128LE;
                   break;
                 default:
-                  return parser.emit('error', new Error((0, _sprintf.sprintf)('Unsupported numeric size %d', dataLength - 1)));
+                  return parser.emit('error', new Error(sprintf('Unsupported numeric size %d', dataLength - 1)));
               }
 
               readValue.call(parser, function (value) {
@@ -331,18 +331,46 @@ exports['default'] = function (parser, metaData, options, callback) {
               });
 
             default:
-              return parser.emit('error', new Error((0, _sprintf.sprintf)('Unsupported guid size %d', dataLength - 1)));
+              return parser.emit('error', new Error(sprintf('Unsupported guid size %d', dataLength - 1)));
           }
+          break;
 
         case 'UDT':
           return readMaxBinary(parser, callback);
 
+        case 'Variant':
+          var valueMetaData = metaData.valueMetaData = {};
+          Object.defineProperty(valueMetaData, 'isVariantValue', { value: true });
+          return parser.readUInt8(function (baseType) {
+            return parser.readUInt8(function (propBytes) {
+              valueMetaData.dataLength = dataLength - propBytes - 2;
+              valueMetaData.type = TYPE[baseType];
+              return readPrecision(parser, valueMetaData.type, function (precision) {
+                valueMetaData.precision = precision;
+                return readScale(parser, valueMetaData.type, function (scale) {
+                  valueMetaData.scale = scale;
+                  return readCollation(parser, valueMetaData.type, function (collation) {
+                    valueMetaData.collation = collation;
+                    if (baseType === 0xA5 || baseType === 0xAD || baseType === 0xA7 || baseType === 0xAF || baseType === 0xE7 || baseType === 0xEF) {
+                      return readDataLength(parser, valueMetaData.type, {}, null, function (maxDataLength) {
+                        valueMetaData.dataLength = maxDataLength;
+                        return valueParse(parser, valueMetaData, options, callback);
+                      });
+                    } else {
+                      return valueParse(parser, valueMetaData, options, callback);
+                    }
+                  });
+                });
+              });
+            });
+          });
+
         default:
-          return parser.emit('error', new Error((0, _sprintf.sprintf)('Unrecognised type %s', type.name)));
+          return parser.emit('error', new Error(sprintf('Unrecognised type %s', type.name)));
       }
     });
   });
-};
+}
 
 function readBinary(parser, dataLength, callback) {
   if (dataLength === NULL) {
@@ -361,7 +389,7 @@ function readChars(parser, dataLength, codepage, callback) {
     return callback(null);
   } else {
     return parser.readBuffer(dataLength, function (data) {
-      callback(_iconvLite2['default'].decode(data, codepage));
+      callback(iconv.decode(data, codepage));
     });
   }
 }
@@ -371,7 +399,7 @@ function readNChars(parser, dataLength, callback) {
     return callback(null);
   } else {
     return parser.readBuffer(dataLength, function (data) {
-      callback(data.toString("ucs2"));
+      callback(data.toString('ucs2'));
     });
   }
 }
@@ -387,7 +415,7 @@ function readMaxChars(parser, codepage, callback) {
 
   readMax(parser, function (data) {
     if (data) {
-      callback(_iconvLite2['default'].decode(data, codepage));
+      callback(iconv.decode(data, codepage));
     } else {
       callback(null);
     }
@@ -415,7 +443,7 @@ function readMax(parser, callback) {
       var high = type.readUInt32LE(4);
 
       if (high >= 2 << 53 - 32) {
-        console.warn("Read UInt64LE > 53 bits : high=" + high + ", low=" + low);
+        console.warn('Read UInt64LE > 53 bits : high=' + high + ', low=' + low);
       }
 
       var expectedLength = low + 0x100000000 * high;
@@ -427,8 +455,7 @@ function readMax(parser, callback) {
 function readMaxKnownLength(parser, totalLength, callback) {
   var data = new Buffer(totalLength);
 
-  var offset = 0,
-      chunkLength = undefined;
+  var offset = 0;
   function next(done) {
     parser.readUInt32LE(function (chunkLength) {
       if (!chunkLength) {
@@ -446,7 +473,7 @@ function readMaxKnownLength(parser, totalLength, callback) {
 
   next(function () {
     if (offset !== totalLength) {
-      parser.emit('error', new Error("Partially Length-prefixed Bytes unmatched lengths : expected " + totalLength + ", but got " + offset + " bytes"));
+      parser.emit('error', new Error('Partially Length-prefixed Bytes unmatched lengths : expected ' + totalLength + ', but got ' + offset + ' bytes'));
     }
 
     callback(data);
@@ -542,7 +569,7 @@ function readTime(parser, dataLength, scale, useUTC, callback) {
     } else {
       date = new Date(1970, 0, 1, 0, 0, 0, value / 10000);
     }
-    Object.defineProperty(date, "nanosecondsDelta", {
+    Object.defineProperty(date, 'nanosecondsDelta', {
       enumerable: false,
       value: value % 10000 / Math.pow(10, 7)
     });
@@ -569,7 +596,7 @@ function readDateTime2(parser, dataLength, scale, useUTC, callback) {
       } else {
         date = new Date(2000, 0, days - 730118, time.getHours(), time.getMinutes(), time.getSeconds(), time.getMilliseconds());
       }
-      Object.defineProperty(date, "nanosecondsDelta", {
+      Object.defineProperty(date, 'nanosecondsDelta', {
         enumerable: false,
         value: time.nanosecondsDelta
       });
@@ -584,7 +611,7 @@ function readDateTimeOffset(parser, dataLength, scale, callback) {
       // offset
       parser.readInt16LE(function () {
         var date = new Date(Date.UTC(2000, 0, days - 730118, 0, 0, 0, +time));
-        Object.defineProperty(date, "nanosecondsDelta", {
+        Object.defineProperty(date, 'nanosecondsDelta', {
           enumerable: false,
           value: time.nanosecondsDelta
         });
@@ -592,5 +619,4 @@ function readDateTimeOffset(parser, dataLength, scale, callback) {
       });
     });
   });
-}
-module.exports = exports['default'];
+}

package/package.json

@@ -27,7 +27,7 @@
   "homepage": "https://github.com/pekim/tedious",
   "bugs": "https://github.com/pekim/tedious/issues",
   "license": "MIT",
-  "version": "1.13.2",
+  "version": "1.14.0",
   "main": "./lib/tedious.js",
   "repository": {
     "type": "git",
@@ -42,6 +42,7 @@
     "bl": "^1.0.0",
     "iconv-lite": "^0.4.11",
     "readable-stream": "^2.0.2",
+    "semver": "^5.1.0",
     "sprintf": "0.1.5"
   },
   "devDependencies": {
@@ -49,11 +50,15 @@
     "babel": "^5.8.19",
     "benchmark": "^1.0.0",
     "coffee-script": "^1.9.3",
+    "eslint": "^1.10.3",
     "nodeunit": "^0.9.1"
   },
   "scripts": {
+    "pretest": "eslint src test",
     "test": "nodeunit --reporter minimal test/setup.js test/unit/ test/unit/token/ test/unit/tracking-buffer",
+    "pretest-all": "eslint src test",
     "test-all": "nodeunit --reporter minimal test/setup.js test/unit/ test/unit/token/ test/unit/tracking-buffer test/integration/",
+    "pretest-integration": "eslint src test",
     "test-integration": "nodeunit --reporter minimal test/setup.js test/integration/",
     "prepublish": "coffee scripts/build.coffee"
   },