node-firebird 1.1.1 → 1.1.2

package/lib/index.js

@@ -9,7 +9,7 @@ var
     XdrWriter = serialize.XdrWriter,
     BlrWriter = serialize.BlrWriter,
 	BitSet = serialize.BitSet,
-    messages = require('./messages.js'),
+    MessagesError = require('./firebird.msg.json'),
     crypt = require('./unix-crypt.js'),
     path = require('path'),
 	srp = require('./srp'),
@@ -22,97 +22,127 @@ if (typeof(setImmediate) === 'undefined') {
 }
 
 /**
- * Parse date from string
- * @return {Date}
+ * Get Error Message per gdscode
+ * @param {{gdscode: Number, params: Any[]}[]} status
+ * @returns {String} - Error message
  */
-if (String.prototype.parseDate === undefined) {
-    String.prototype.parseDate = function() {
-        var self = this.trim();
-        var arr = self.indexOf(' ') === -1 ? self.split('T') : self.split(' ');
-        var index = arr[0].indexOf(':');
-        var length = arr[0].length;
-
-        if (index !== -1) {
-            var tmp = arr[1];
-            arr[1] = arr[0];
-            arr[0] = tmp;
+const lookupMessages = (status) => {
+    const messages = status.map((item) => {
+        let text = MessagesError[item.gdscode];
+        if (text === undefined) {
+            return 'Unknow error';
+        }
+        if (item.params !== undefined) {
+            item.params.forEach((param, i) => {
+                text = text.replace('@' + (i + 1), param);
+            });
         }
+        return text;
+    });
+    return messages.join(', ');
+}
 
-        if (arr[0] === undefined)
-            arr[0] = '';
+/**
+ * Parse date from string
+ * @param {String} str
+ * @return {Date}
+ */
+const parseDate = (str) => {
+    const self = str.trim();
+    const arr = self.indexOf(' ') === -1 ? self.split('T') : self.split(' ');
+    let index = arr[0].indexOf(':');
+    const length = arr[0].length;
+
+    if (index !== -1) {
+        const tmp = arr[1];
+        arr[1] = arr[0];
+        arr[0] = tmp;
+    }
 
-        var noTime = arr[1] === undefined ? true : arr[1].length === 0;
+    if (arr[0] === undefined) {
+        arr[0] = '';
+    }
 
-        for (var i = 0; i < length; i++) {
-            var c = arr[0].charCodeAt(i);
-            if (c > 47 && c < 58)
-                continue;
-            if (c === 45 || c === 46)
-                continue;
+    const noTime = arr[1] === undefined || arr[1].length === 0;
 
-            if (noTime)
-                return new Date(self);
+    for (let i = 0; i < length; i++) {
+        const c = arr[0].charCodeAt(i);
+        if (c > 47 && c < 58) {
+            continue;
+        }
+        if (c === 45 || c === 46) {
+            continue;
+        }
+        if (noTime) {
+            return new Date(self);
         }
+    }
 
-        if (arr[1] === undefined)
-            arr[1] = '00:00:00';
+    if (arr[1] === undefined) {
+        arr[1] = '00:00:00';
+    }
 
-        var firstDay = arr[0].indexOf('-') === -1;
+    const firstDay = arr[0].indexOf('-') === -1;
 
-        var date = (arr[0] || '').split(firstDay ? '.' : '-');
-        var time = (arr[1] || '').split(':');
-        var parsed = [];
+    const date = (arr[0] || '').split(firstDay ? '.' : '-');
+    const time = (arr[1] || '').split(':');
 
-        if (date.length < 4 && time.length < 2) {
-            return new Date(self);
-        }
+    if (date.length < 4 && time.length < 2) {
+        return new Date(self);
+    }
 
-        index = (time[2] || '').indexOf('.');
+    index = (time[2] || '').indexOf('.');
 
-        // milliseconds
-        if (index !== -1) {
-            time[3] = time[2].substring(index + 1);
-            time[2] = time[2].substring(0, index);
-        } else {
-            time[3] = '0';
-        }
+    // milliseconds
+    if (index !== -1) {
+        time[3] = time[2].substring(index + 1);
+        time[2] = time[2].substring(0, index);
+    } else {
+        time[3] = '0';
+    }
 
-        parsed.push(parseInt(date[firstDay ? 2 : 0], 10)); // year
-        parsed.push(parseInt(date[1], 10)); // month
-        parsed.push(parseInt(date[firstDay ? 0 : 2], 10)); // day
-        parsed.push(parseInt(time[0], 10)); // hours
-        parsed.push(parseInt(time[1], 10)); // minutes
-        parsed.push(parseInt(time[2], 10)); // seconds
-        parsed.push(parseInt(time[3], 10)); // miliseconds
+    const parsed = [
+        parseInt(date[firstDay ? 2 : 0], 10), // year
+        parseInt(date[1], 10), // month
+        parseInt(date[firstDay ? 0 : 2], 10), // day
+        parseInt(time[0], 10), // hours
+        parseInt(time[1], 10), // minutes
+        parseInt(time[2], 10), // seconds
+        parseInt(time[3], 10) // miliseconds
+    ];
 
-        var def = new Date();
+    const def = new Date();
 
-        for (var i = 0, length = parsed.length; i < length; i++) {
-            if (isNaN(parsed[i]))
-                parsed[i] = 0;
+    for (let i = 0; i < parsed.length; i++) {
+        if (isNaN(parsed[i])) {
+            parsed[i] = 0;
+        }
 
-            var value = parsed[i];
-            if (value !== 0)
-                continue;
+        const value = parsed[i];
+        if (value !== 0) {
+            continue;
+        }
 
-            switch (i) {
-                case 0:
-                    if (value <= 0)
-                        parsed[i] = def.getFullYear();
-                    break;
-                case 1:
-                    if (value <= 0)
-                        parsed[i] = def.getMonth() + 1;
-                    break;
-                case 2:
-                    if (value <= 0)
-                        parsed[i] = def.getDate();
-                    break;
-            }
+        switch (i) {
+            case 0:
+                if (value <= 0) {
+                    parsed[i] = def.getFullYear();
+                }
+                break;
+            case 1:
+                if (value <= 0) {
+                    parsed[i] = def.getMonth() + 1;
+                }
+                break;
+            case 2:
+                if (value <= 0) {
+                    parsed[i] = def.getDate();
+                }
+                break;
         }
+    }
 
-        return new Date(parsed[0], parsed[1] - 1, parsed[2], parsed[3], parsed[4], parsed[5]);
-    };
+    return new Date(parsed[0], parsed[1] - 1, parsed[2], parsed[3], parsed[4], parsed[5]);
 }
 
 function noop() {}
@@ -883,8 +913,12 @@ const
 function SQLVarText() {}
 
 SQLVarText.prototype.decode = function(data, lowerV13) {
-    var ret;
+    let ret;
     if (this.subType > 1) {
+        // ToDo: with column charset
+        ret = data.readText(this.length, DEFAULT_ENCODING);
+    } else if (this.subType === 0) {
+        // without charset definition
         ret = data.readText(this.length, DEFAULT_ENCODING);
     } else {
         ret = data.readBuffer(this.length);
@@ -913,16 +947,21 @@ SQLVarNull.prototype.constructor = SQLVarNull;
 function SQLVarString() {}
 
 SQLVarString.prototype.decode = function(data, lowerV13) {
-    var ret;
+    let ret;
     if (this.subType > 1) {
-        ret = data.readString(DEFAULT_ENCODING)
+        // ToDo: with column charset
+        ret = data.readString(DEFAULT_ENCODING);
+    } else if (this.subType === 0) {
+        // without charset definition
+        ret = data.readString(DEFAULT_ENCODING);
     } else {
-        ret = data.readBuffer()
+        ret = data.readBuffer();
     }
 
     if (!lowerV13 || !data.readInt()) {
         return ret;
     }
+
     return null;
 };
 
@@ -3095,11 +3134,8 @@ exports.Connection.prototype._bind_events = function(host, port, callback) {
                 self._pending.shift();
 
                 if (obj && obj.status) {
-                    messages.lookupMessages(obj.status, self._messageFile, function (message) {
-                        obj.message = message;
-                        doCallback(obj, cb);
-                    });
-
+                    obj.message = lookupMessages(obj.status);
+                    doCallback(obj, cb);
                 } else {
                     doCallback(obj, cb);
                 }
@@ -4297,7 +4333,7 @@ Connection.prototype.executeStatement = function(transaction, statement, params,
                         if (value instanceof Date)
                             ret[i] = new SQLParamDate(value);
                         else if (typeof(value) === 'string')
-                            ret[i] = new SQLParamDate(value.parseDate());
+                            ret[i] = new SQLParamDate(parseDate(value));
                         else
                             ret[i] = new SQLParamDate(new Date(value));
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-firebird",
-    "version": "1.1.1",
+    "version": "1.1.2",
     "description": "Pure JavaScript and Asynchronous Firebird client for Node.js.",
     "keywords": [
         "firebird",