node-firebird 1.1.10 → 2.0.1

package/lib/wire/xsqlvar.js

@@ -15,481 +15,490 @@ const
 
 //------------------------------------------------------
 
-function SQLVarText() {}
+class SQLVarText {
+    decode(data, lowerV13) {
+        let ret;
+        if (this.subType > 1) {
+            // ToDo: with column charset
+            ret = data.readText(this.length, Const.DEFAULT_ENCODING);
+        } else if (this.subType === 0) {
+            // without charset definition
+            ret = data.readText(this.length, Const.DEFAULT_ENCODING);
+        } else {
+            ret = data.readBuffer(this.length);
+        }
 
-SQLVarText.prototype.decode = function(data, lowerV13) {
-    let ret;
-    if (this.subType > 1) {
-        // ToDo: with column charset
-        ret = data.readText(this.length, Const.DEFAULT_ENCODING);
-    } else if (this.subType === 0) {
-        // without charset definition
-        ret = data.readText(this.length, Const.DEFAULT_ENCODING);
-    } else {
-        ret = data.readBuffer(this.length);
-    }
+        if (!lowerV13 || !data.readInt()) {
+            return ret;
+        }
 
-    if (!lowerV13 || !data.readInt()) {
-        return ret;
+        return null;
     }
 
-    return null;
-};
-
-SQLVarText.prototype.calcBlr = function(blr) {
-    blr.addByte(Const.blr_text);
-    blr.addWord(this.length);
-};
+    calcBlr(blr) {
+        blr.addByte(Const.blr_text);
+        blr.addWord(this.length);
+    }
+}
 
 //------------------------------------------------------
 
-function SQLVarNull() {}
-SQLVarNull.prototype = new SQLVarText();
-SQLVarNull.prototype.constructor = SQLVarNull;
+class SQLVarNull extends SQLVarText {
+}
 
 //------------------------------------------------------
 
-function SQLVarString() {}
+class SQLVarString {
+    decode(data, lowerV13) {
+        let ret;
+        if (this.subType > 1) {
+            // ToDo: with column charset
+            ret = data.readString(Const.DEFAULT_ENCODING);
+        } else if (this.subType === 0) {
+            // without charset definition
+            ret = data.readString(Const.DEFAULT_ENCODING);
+        } else {
+            ret = data.readBuffer();
+        }
 
-SQLVarString.prototype.decode = function(data, lowerV13) {
-    let ret;
-    if (this.subType > 1) {
-        // ToDo: with column charset
-        ret = data.readString(Const.DEFAULT_ENCODING);
-    } else if (this.subType === 0) {
-        // without charset definition
-        ret = data.readString(Const.DEFAULT_ENCODING);
-    } else {
-        ret = data.readBuffer();
-    }
+        if (!lowerV13 || !data.readInt()) {
+            return ret;
+        }
 
-    if (!lowerV13 || !data.readInt()) {
-        return ret;
+        return null;
     }
 
-    return null;
-};
-
-SQLVarString.prototype.calcBlr = function(blr) {
-    blr.addByte(Const.blr_varying);
-    blr.addWord(this.length);
-};
+    calcBlr(blr) {
+        blr.addByte(Const.blr_varying);
+        blr.addWord(this.length);
+    }
+}
 
 //------------------------------------------------------
 
-function SQLVarQuad() {}
+class SQLVarQuad {
+    decode(data, lowerV13) {
+        var ret = data.readQuad();
 
-SQLVarQuad.prototype.decode = function(data, lowerV13) {
-    var ret = data.readQuad();
-
-    if (!lowerV13 || !data.readInt()) {
-        return ret;
+        if (!lowerV13 || !data.readInt()) {
+            return ret;
+        }
+        return null;
     }
-    return null;
-};
 
-SQLVarQuad.prototype.calcBlr = function(blr) {
-    blr.addByte(Const.blr_quad);
-    blr.addShort(this.scale);
-};
+    calcBlr(blr) {
+        blr.addByte(Const.blr_quad);
+        blr.addShort(this.scale);
+    }
+}
 
 //------------------------------------------------------
 
-function SQLVarBlob() {}
-SQLVarBlob.prototype = new SQLVarQuad();
-SQLVarBlob.prototype.constructor = SQLVarBlob;
-
-SQLVarBlob.prototype.calcBlr = function(blr) {
-    blr.addByte(Const.blr_quad);
-    blr.addShort(0);
-};
+class SQLVarBlob extends SQLVarQuad {
+    calcBlr(blr) {
+        blr.addByte(Const.blr_quad);
+        blr.addShort(0);
+    }
+}
 
 //------------------------------------------------------
 
-function SQLVarArray() {}
-SQLVarArray.prototype = new SQLVarQuad();
-SQLVarArray.prototype.constructor = SQLVarArray;
-
-SQLVarArray.prototype.calcBlr = function(blr) {
-    blr.addByte(Const.blr_quad);
-    blr.addShort(0);
-};
+class SQLVarArray extends SQLVarQuad {
+    calcBlr(blr) {
+        blr.addByte(Const.blr_quad);
+        blr.addShort(0);
+    }
+}
 
 //------------------------------------------------------
 
-function SQLVarInt() {}
+class SQLVarInt {
+    decode(data, lowerV13) {
+        var ret = data.readInt();
 
-SQLVarInt.prototype.decode = function(data, lowerV13) {
-    var ret = data.readInt();
+        if (this.scale) {
+            ret = ret / ScaleDivisor[Math.abs(this.scale)];
+        }
 
-    if (this.scale) {
-        ret = ret / ScaleDivisor[Math.abs(this.scale)];
-    }
+        if (!lowerV13 || !data.readInt()) {
+            return ret;
+        }
 
-    if (!lowerV13 || !data.readInt()) {
-        return ret;
+        return null;
     }
 
-    return null;
-};
-
-SQLVarInt.prototype.calcBlr = function(blr) {
-    blr.addByte(Const.blr_long);
-    blr.addShort(this.scale);
-};
+    calcBlr(blr) {
+        blr.addByte(Const.blr_long);
+        blr.addShort(this.scale);
+    }
+}
 
 //------------------------------------------------------
 
-function SQLVarShort() {}
-SQLVarShort.prototype = new SQLVarInt();
-SQLVarShort.prototype.constructor = SQLVarShort;
-
-SQLVarShort.prototype.calcBlr = function(blr) {
-    blr.addByte(Const.blr_short);
-    blr.addShort(this.scale);
-};
+class SQLVarShort extends SQLVarInt {
+    calcBlr(blr) {
+        blr.addByte(Const.blr_short);
+        blr.addShort(this.scale);
+    }
+}
 
 //------------------------------------------------------
 
-function SQLVarInt64() {}
+class SQLVarInt64 {
+    decode(data, lowerV13) {
+        var ret = data.readInt64();
 
-SQLVarInt64.prototype.decode = function(data, lowerV13) {
-    var ret = data.readInt64();
+        if (this.scale) {
+            ret = ret / ScaleDivisor[Math.abs(this.scale)];
+        }
 
-    if (this.scale) {
-        ret = ret / ScaleDivisor[Math.abs(this.scale)];
+        if (!lowerV13 || !data.readInt()) {
+            return ret;
+        }
+        return null;
     }
 
-    if (!lowerV13 || !data.readInt()) {
-        return ret;
+    calcBlr(blr) {
+        blr.addByte(Const.blr_int64);
+        blr.addShort(this.scale);
     }
-    return null;
-};
-
-SQLVarInt64.prototype.calcBlr = function(blr) {
-    blr.addByte(Const.blr_int64);
-    blr.addShort(this.scale);
-};
+}
 
 //------------------------------------------------------
 
-function SQLVarInt128() {}
+class SQLVarInt128 {
+    decode(data, lowerV13) {
+        var retBigInt = BigInt(data.readInt128())
 
-SQLVarInt128.prototype.decode = function (data, lowerV13) {
-    var retBigInt = BigInt(data.readInt128())
+        if (retBigInt > BigInt(Number.MAX_SAFE_INTEGER)) {
+            var ret = retBigInt.toString();
 
-    if (retBigInt > BigInt(Number.MAX_SAFE_INTEGER)) {
-        var ret = retBigInt.toString();
+            var integerPart = ret.slice(0, Math.abs(this.scale) * -1)
+            var decimalPart = ret.slice(Math.abs(this.scale) * -1)
 
-        var integerPart = ret.slice(0, Math.abs(this.scale) * -1)
-        var decimalPart = ret.slice(Math.abs(this.scale) * -1)
+            if (integerPart === '') integerPart = '0'
 
-        if (integerPart === '') integerPart = '0'
+            ret = `${integerPart}.${decimalPart}`
+        } else {
+            var ret = Number(retBigInt);
+            ret = ret / ScaleDivisor[Math.abs(this.scale)];
+        }
 
-        ret = `${integerPart}.${decimalPart}`
-    } else {
-        var ret = Number(retBigInt);
-        ret = ret / ScaleDivisor[Math.abs(this.scale)];
-    }
+        if (!lowerV13 || !data.readInt()) {
+            return ret;
+        }
 
-    if (!lowerV13 || !data.readInt()) {
-        return ret;
+        return null;
     }
 
-    return null;
-};
-
-SQLVarInt128.prototype.calcBlr = function (blr) {
-    blr.addByte(Const.blr_int128);
-    blr.addShort(this.scale);
-};
+    calcBlr(blr) {
+        blr.addByte(Const.blr_int128);
+        blr.addShort(this.scale);
+    }
+}
 
 //------------------------------------------------------
 
-function SQLVarFloat() { }
+class SQLVarFloat {
+    decode(data, lowerV13) {
+        var ret = data.readFloat();
 
-SQLVarFloat.prototype.decode = function(data, lowerV13) {
-    var ret = data.readFloat();
+        if (!lowerV13 || !data.readInt()) {
+            return ret;
+        }
 
-    if (!lowerV13 || !data.readInt()) {
-        return ret;
+        return null;
     }
 
-    return null;
-};
-
-SQLVarFloat.prototype.calcBlr = function(blr) {
-    blr.addByte(Const.blr_float);
-};
+    calcBlr(blr) {
+        blr.addByte(Const.blr_float);
+    }
+}
 
 //------------------------------------------------------
 
-function SQLVarDouble() {}
+class SQLVarDouble {
+    decode(data, lowerV13) {
+        var ret = data.readDouble();
 
-SQLVarDouble.prototype.decode = function(data, lowerV13) {
-    var ret = data.readDouble();
+        if (!lowerV13 || !data.readInt()) {
+            return ret;
+        }
 
-    if (!lowerV13 || !data.readInt()) {
-        return ret;
+        return null;
     }
 
-    return null;
-};
-
-SQLVarDouble.prototype.calcBlr = function(blr) {
-    blr.addByte(Const.blr_double);
-};
+    calcBlr(blr) {
+        blr.addByte(Const.blr_double);
+    }
+}
 
 //------------------------------------------------------
 
-function SQLVarDate() {}
+class SQLVarDate {
+    decode(data, lowerV13) {
+        var ret = data.readInt();
 
-SQLVarDate.prototype.decode = function(data, lowerV13) {
-    var ret = data.readInt();
+        if (!lowerV13 || !data.readInt()) {
+            var d = new Date(0);
+            d.setMilliseconds((ret - DateOffset) * TimeCoeff + d.getTimezoneOffset() * MsPerMinute);
+            return d;
+        }
 
-    if (!lowerV13 || !data.readInt()) {
-        var d = new Date(0);
-        d.setMilliseconds((ret - DateOffset) * TimeCoeff + d.getTimezoneOffset() * MsPerMinute);
-        return d;
+        return null;
     }
 
-    return null;
-};
-
-SQLVarDate.prototype.calcBlr = function(blr) {
-    blr.addByte(Const.blr_sql_date);
-};
+    calcBlr(blr) {
+        blr.addByte(Const.blr_sql_date);
+    }
+}
 
 //------------------------------------------------------
 
-function SQLVarTime() {}
-
-SQLVarTime.prototype.decode = function(data, lowerV13) {
-    var ret = data.readUInt();
+class SQLVarTime {
+    decode(data, lowerV13) {
+        var ret = data.readUInt();
 
-    if (!lowerV13 || !data.readInt()) {
-        var d = new Date(0);
-        d.setMilliseconds(Math.floor(ret / 10) + d.getTimezoneOffset() * MsPerMinute);
-        return d;
+        if (!lowerV13 || !data.readInt()) {
+            var d = new Date(0);
+            d.setMilliseconds(Math.floor(ret / 10) + d.getTimezoneOffset() * MsPerMinute);
+            return d;
+        }
+        return null;
     }
-    return null;
-};
 
-SQLVarTime.prototype.calcBlr = function(blr) {
-    blr.addByte(Const.blr_sql_time);
-};
+    calcBlr(blr) {
+        blr.addByte(Const.blr_sql_time);
+    }
+}
 
 //------------------------------------------------------
 
-function SQLVarTimeStamp() {}
+class SQLVarTimeStamp {
+    decode(data, lowerV13) {
+        var date = data.readInt();
+        var time = data.readUInt();
 
-SQLVarTimeStamp.prototype.decode = function(data, lowerV13) {
-    var date = data.readInt();
-    var time = data.readUInt();
+        if (!lowerV13 || !data.readInt()) {
+            var d = new Date(0);
+            d.setMilliseconds((date - DateOffset) * TimeCoeff + Math.floor(time / 10) + d.getTimezoneOffset() * MsPerMinute);
+            return d;
+        }
 
-    if (!lowerV13 || !data.readInt()) {
-        var d = new Date(0);
-        d.setMilliseconds((date - DateOffset) * TimeCoeff + Math.floor(time / 10) + d.getTimezoneOffset() * MsPerMinute);
-        return d;
+        return null;
     }
 
-    return null;
-};
-
-SQLVarTimeStamp.prototype.calcBlr = function(blr) {
-    blr.addByte(Const.blr_timestamp);
-};
+    calcBlr(blr) {
+        blr.addByte(Const.blr_timestamp);
+    }
+}
 
 //------------------------------------------------------
 
-function SQLVarBoolean() {}
-
-SQLVarBoolean.prototype.decode = function(data, lowerV13) {
-    var ret = data.readInt();
+class SQLVarBoolean {
+    decode(data, lowerV13) {
+        var ret = data.readInt();
 
-    if (!lowerV13 || !data.readInt()) {
-        return Boolean(ret);
+        if (!lowerV13 || !data.readInt()) {
+            return Boolean(ret);
+        }
+        return null;
     }
-    return null;
-};
 
-SQLVarBoolean.prototype.calcBlr = function(blr) {
-    blr.addByte(Const.blr_bool);
-};
+    calcBlr(blr) {
+        blr.addByte(Const.blr_bool);
+    }
+}
 
 //------------------------------------------------------
 
-function SQLParamInt(value){
-    this.value = value;
-}
+class SQLParamInt {
+    constructor(value) {
+        this.value = value;
+    }
 
-SQLParamInt.prototype.calcBlr = function(blr) {
-    blr.addByte(Const.blr_long);
-    blr.addShort(0);
-};
+    calcBlr(blr) {
+        blr.addByte(Const.blr_long);
+        blr.addShort(0);
+    }
 
-SQLParamInt.prototype.encode = function(data) {
-    if (this.value != null) {
-        data.addInt(this.value);
-    } else {
-        data.addInt(0);
-        data.addInt(1);
+    encode(data) {
+        if (this.value != null) {
+            data.addInt(this.value);
+        } else {
+            data.addInt(0);
+            data.addInt(1);
+        }
     }
-};
+}
 
 //------------------------------------------------------
 
-function SQLParamInt64(value){
-    this.value = value;
-}
+class SQLParamInt64 {
+    constructor(value) {
+        this.value = value;
+    }
 
-SQLParamInt64.prototype.calcBlr = function(blr) {
-    blr.addByte(Const.blr_int64);
-    blr.addShort(0);
-};
+    calcBlr(blr) {
+        blr.addByte(Const.blr_int64);
+        blr.addShort(0);
+    }
 
-SQLParamInt64.prototype.encode = function(data) {
-    if (this.value != null) {
-        data.addInt64(this.value);
-    } else {
-        data.addInt64(0);
-        data.addInt(1);
+    encode(data) {
+        if (this.value != null) {
+            data.addInt64(this.value);
+        } else {
+            data.addInt64(0);
+            data.addInt(1);
+        }
     }
-};
+}
 
 //------------------------------------------------------
 
-function SQLParamInt128(value) {
-    this.value = value;
-}
+class SQLParamInt128 {
+    constructor(value) {
+        this.value = value;
+    }
 
-SQLParamInt128.prototype.calcBlr = function (blr) {
-    blr.addByte(Const.blr_int128);
-    blr.addShort(0);
-};
+    calcBlr(blr) {
+        blr.addByte(Const.blr_int128);
+        blr.addShort(0);
+    }
 
-SQLParamInt128.prototype.encode = function (data) {
-    if (this.value != null) {
-        data.addInt128(this.value);
-    } else {
-        data.addInt128(0);
-        data.addInt(1);
+    encode(data) {
+        if (this.value != null) {
+            data.addInt128(this.value);
+        } else {
+            data.addInt128(0);
+            data.addInt(1);
+        }
     }
-};
+}
 
 //------------------------------------------------------
 
-function SQLParamDouble(value) {
-    this.value = value;
-}
+class SQLParamDouble {
+    constructor(value) {
+        this.value = value;
+    }
 
-SQLParamDouble.prototype.encode = function(data) {
-    if (this.value != null) {
-        data.addDouble(this.value);
-    } else {
-        data.addDouble(0);
-        data.addInt(1);
+    encode(data) {
+        if (this.value != null) {
+            data.addDouble(this.value);
+        } else {
+            data.addDouble(0);
+            data.addInt(1);
+        }
     }
-};
 
-SQLParamDouble.prototype.calcBlr = function(blr) {
-    blr.addByte(Const.blr_double);
-};
+    calcBlr(blr) {
+        blr.addByte(Const.blr_double);
+    }
+}
 
 //------------------------------------------------------
 
-function SQLParamString(value) {
-    this.value = value;
-}
+class SQLParamString {
+    constructor(value) {
+        this.value = value;
+    }
 
-SQLParamString.prototype.encode = function(data) {
-    if (this.value != null) {
-        data.addText(this.value, Const.DEFAULT_ENCODING);
-    } else {
-        data.addInt(1);
+    encode(data) {
+        if (this.value != null) {
+            data.addText(this.value, Const.DEFAULT_ENCODING);
+        } else {
+            data.addInt(1);
+        }
     }
-};
 
-SQLParamString.prototype.calcBlr = function(blr) {
-    blr.addByte(Const.blr_text);
-    var len = this.value ? Buffer.byteLength(this.value, Const.DEFAULT_ENCODING) : 0;
-    blr.addWord(len);
-};
+    calcBlr(blr) {
+        blr.addByte(Const.blr_text);
+        var len = this.value ? Buffer.byteLength(this.value, Const.DEFAULT_ENCODING) : 0;
+        blr.addWord(len);
+    }
+}
 
 //------------------------------------------------------
 
-function SQLParamQuad(value) {
-    this.value = value;
-}
-
-SQLParamQuad.prototype.encode = function(data) {
-    if (this.value != null) {
-        data.addInt(this.value.high);
-        data.addInt(this.value.low);
-    } else {
-        data.addInt(0);
-        data.addInt(0);
-        data.addInt(1);
+class SQLParamQuad {
+    constructor(value) {
+        this.value = value;
     }
-};
-
-SQLParamQuad.prototype.calcBlr = function(blr) {
-    blr.addByte(Const.blr_quad);
-    blr.addShort(0);
-};
 
-//------------------------------------------------------
+    encode(data) {
+        if (this.value != null) {
+            data.addInt(this.value.high);
+            data.addInt(this.value.low);
+        } else {
+            data.addInt(0);
+            data.addInt(0);
+            data.addInt(1);
+        }
+    }
 
-function SQLParamDate(value) {
-    this.value = value;
+    calcBlr(blr) {
+        blr.addByte(Const.blr_quad);
+        blr.addShort(0);
+    }
 }
 
-SQLParamDate.prototype.encode = function(data) {
-    if (this.value != null) {
+//------------------------------------------------------
 
-        var value = this.value.getTime() - this.value.getTimezoneOffset() * MsPerMinute;
-        var time = value % TimeCoeff;
-        var date = (value - time) / TimeCoeff + DateOffset;
-        time *= 10;
+class SQLParamDate {
+    constructor(value) {
+        this.value = value;
+    }
 
-        // check overflow
-        if (time < 0) {
-            date--;
-            time = TimeCoeff*10 + time;
+    encode(data) {
+        if (this.value != null) {
+
+            var value = this.value.getTime() - this.value.getTimezoneOffset() * MsPerMinute;
+            var time = value % TimeCoeff;
+            var date = (value - time) / TimeCoeff + DateOffset;
+            time *= 10;
+
+            // check overflow
+            if (time < 0) {
+                date--;
+                time = TimeCoeff*10 + time;
+            }
+
+            data.addInt(date);
+            data.addUInt(time);
+        } else {
+            data.addInt(0);
+            data.addUInt(0);
+            data.addInt(1);
         }
-
-        data.addInt(date);
-        data.addUInt(time);
-    } else {
-        data.addInt(0);
-        data.addUInt(0);
-        data.addInt(1);
     }
-};
 
-SQLParamDate.prototype.calcBlr = function(blr) {
-    blr.addByte(Const.blr_timestamp);
-};
+    calcBlr(blr) {
+        blr.addByte(Const.blr_timestamp);
+    }
+}
 
 //------------------------------------------------------
 
-function SQLParamBool(value) {
-    this.value = value;
-}
+class SQLParamBool {
+    constructor(value) {
+        this.value = value;
+    }
 
-SQLParamBool.prototype.encode = function(data) {
-    if (this.value != null) {
-        data.addInt(this.value ? 1 : 0);
-    } else {
-        data.addInt(0);
-        data.addInt(1);
+    encode(data) {
+        if (this.value != null) {
+            data.addInt(this.value ? 1 : 0);
+        } else {
+            data.addInt(0);
+            data.addInt(1);
+        }
     }
-};
 
-SQLParamBool.prototype.calcBlr = function(blr) {
-    blr.addByte(Const.blr_short);
-    blr.addShort(0);
-};
+    calcBlr(blr) {
+        blr.addByte(Const.blr_short);
+        blr.addShort(0);
+    }
+}
 
 module.exports = {
     SQLVarArray,