tedious 6.4.0 → 6.6.2

package/lib/bulk-load.js

@@ -9,18 +9,17 @@ var _events = require("events");
 
 var _writableTrackingBuffer = _interopRequireDefault(require("./tracking-buffer/writable-tracking-buffer"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _readableStream = require("readable-stream");
 
-const Transform = require('readable-stream').Transform;
+var _token = require("./token/token");
 
-const TOKEN_TYPE = require('./token/token').TYPE;
+var _message = _interopRequireDefault(require("./message"));
 
-const Message = require('./message');
+var _packet = require("./packet");
 
-const PACKET_TYPE = require('./packet').TYPE;
+var _errors = require("./errors");
 
-const _require = require('./errors'),
-      RequestError = _require.RequestError;
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const FLAGS = {
   nullable: 1 << 0,
@@ -129,16 +128,12 @@ class BulkLoad extends _events.EventEmitter {
       }
     }
 
-    if (type.hasPrecision) {
-      if (column.precision == null && type.resolvePrecision) {
-        column.precision = type.resolvePrecision(column);
-      }
+    if (type.resolvePrecision && column.precision == null) {
+      column.precision = type.resolvePrecision(column);
     }
 
-    if (type.hasScale) {
-      if (column.scale == null && type.resolveScale) {
-        column.scale = type.resolveScale(column);
-      }
+    if (type.resolveScale && column.scale == null) {
+      column.scale = type.resolveScale(column);
     }
 
     this.columns.push(column);
@@ -234,7 +229,7 @@ class BulkLoad extends _events.EventEmitter {
   getColMetaData() {
     const tBuf = new _writableTrackingBuffer.default(100, null, true); // TokenType
 
-    tBuf.writeUInt8(TOKEN_TYPE.COLMETADATA); // Count
+    tBuf.writeUInt8(_token.TYPE.COLMETADATA); // Count
 
     tBuf.writeUInt16LE(this.columns.length);
 
@@ -273,7 +268,7 @@ class BulkLoad extends _events.EventEmitter {
   createDoneToken() {
     // It might be nice to make DoneToken a class if anything needs to create them, but for now, just do it here
     const tBuf = new _writableTrackingBuffer.default(this.options.tdsVersion < '7_2' ? 9 : 13);
-    tBuf.writeUInt8(TOKEN_TYPE.DONE);
+    tBuf.writeUInt8(_token.TYPE.DONE);
     const status = DONE_STATUS.FINAL;
     tBuf.writeUInt16LE(status);
     tBuf.writeUInt16LE(0); // CurCmd (TDS ignores this)
@@ -303,8 +298,8 @@ class BulkLoad extends _events.EventEmitter {
   }
 
   getMessageStream() {
-    const message = new Message({
-      type: PACKET_TYPE.BULK_LOAD
+    const message = new _message.default({
+      type: _packet.TYPE.BULK_LOAD
     });
     this.rowToPacketTransform.pipe(message);
     this.rowToPacketTransform.once('finish', () => {
@@ -312,7 +307,7 @@ class BulkLoad extends _events.EventEmitter {
     });
 
     const onCancel = () => {
-      this.rowToPacketTransform.emit('error', RequestError('Canceled.', 'ECANCEL'));
+      this.rowToPacketTransform.emit('error', (0, _errors.RequestError)('Canceled.', 'ECANCEL'));
       this.rowToPacketTransform.destroy();
     };
 
@@ -335,7 +330,7 @@ var _default = BulkLoad;
 exports.default = _default;
 module.exports = BulkLoad; // A transform that converts rows to packets.
 
-class RowTransform extends Transform {
+class RowTransform extends _readableStream.Transform {
   constructor(bulkLoad) {
     super({
       writableObjectMode: true
@@ -353,7 +348,7 @@ class RowTransform extends Transform {
     }
 
     const buf = new _writableTrackingBuffer.default(64, 'ucs2', true);
-    buf.writeUInt8(TOKEN_TYPE.ROW);
+    buf.writeUInt8(_token.TYPE.ROW);
 
     for (let i = 0; i < this.columns.length; i++) {
       const c = this.columns[i];