node-firebird 1.1.2 → 1.1.4

package/README.md

@@ -230,7 +230,7 @@ Firebird.attach(options, (err, db) => {
     if (err)
         throw err;
 
-    db.transaction(Firebird.ISOLATION_READ_COMMITED, (err, transaction) => {
+    db.transaction(Firebird.ISOLATION_READ_COMMITTED, (err, transaction) => {
         if (err) {
             throw err;
         }
@@ -318,10 +318,10 @@ Firebird.attach(options, function(err, db) {
 __Transaction types:__
 
 - `Firebird.ISOLATION_READ_UNCOMMITTED`
-- `Firebird.ISOLATION_READ_COMMITED`
+- `Firebird.ISOLATION_READ_COMMITTED`
 - `Firebird.ISOLATION_REPEATABLE_READ`
 - `Firebird.ISOLATION_SERIALIZABLE`
-- `Firebird.ISOLATION_READ_COMMITED_READ_ONLY`
+- `Firebird.ISOLATION_READ_COMMITTED_READ_ONLY`
 
 ```js
 Firebird.attach(options, function(err, db) {
@@ -330,7 +330,7 @@ Firebird.attach(options, function(err, db) {
         throw err;
 
     // db = DATABASE
-    db.transaction(Firebird.ISOLATION_READ_COMMITED, function(err, transaction) {
+    db.transaction(Firebird.ISOLATION_READ_COMMITTED, function(err, transaction) {
         transaction.query('INSERT INTO users VALUE(?,?)', [1, 'Janko'], function(err, result) {
 
             if (err) {

package/lib/index.d.ts

@@ -19,7 +19,7 @@ declare module 'node-firebird' {
     /** A transaction sees changes done by uncommitted transactions. */
     export const ISOLATION_READ_UNCOMMITTED: number[];
     /** A transaction sees only data committed before the statement has been executed. */
-    export const ISOLATION_READ_COMMITED: number[];
+    export const ISOLATION_READ_COMMITTED: number[];
     /** A transaction sees during its lifetime only data committed before the transaction has been started. */
     export const ISOLATION_REPEATABLE_READ: number[];
     /**
@@ -27,7 +27,7 @@ declare module 'node-firebird' {
      * Data accessed in the context of a serializable transaction cannot be accessed by any other transaction.
      */
     export const ISOLATION_SERIALIZABLE: number[];
-    export const ISOLATION_READ_COMMITED_READ_ONLY: number[];
+    export const ISOLATION_READ_COMMITTED_READ_ONLY: number[];
 
     export type Isolation = number[];
 

package/lib/index.js

@@ -810,10 +810,10 @@ const DESCRIBE = [
 
 const
     ISOLATION_READ_UNCOMMITTED          = [isc_tpb_version3, isc_tpb_write, isc_tpb_wait, isc_tpb_read_committed, isc_tpb_rec_version],
-    ISOLATION_READ_COMMITED             = [isc_tpb_version3, isc_tpb_write, isc_tpb_wait, isc_tpb_read_committed, isc_tpb_no_rec_version],
+    ISOLATION_READ_COMMITTED             = [isc_tpb_version3, isc_tpb_write, isc_tpb_wait, isc_tpb_read_committed, isc_tpb_no_rec_version],
     ISOLATION_REPEATABLE_READ           = [isc_tpb_version3, isc_tpb_write, isc_tpb_wait, isc_tpb_concurrency],
     ISOLATION_SERIALIZABLE              = [isc_tpb_version3, isc_tpb_write, isc_tpb_wait, isc_tpb_consistency],
-    ISOLATION_READ_COMMITED_READ_ONLY   = [isc_tpb_version3, isc_tpb_read, isc_tpb_wait, isc_tpb_read_committed, isc_tpb_no_rec_version];
+    ISOLATION_READ_COMMITTED_READ_ONLY   = [isc_tpb_version3, isc_tpb_read, isc_tpb_wait, isc_tpb_read_committed, isc_tpb_no_rec_version];
 
 const
     DEFAULT_HOST = '127.0.0.1',
@@ -845,10 +845,10 @@ exports.WIRE_CRYPT_DISABLE = WIRE_CRYPT_DISABLE;
 exports.WIRE_CRYPT_ENABLE = WIRE_CRYPT_ENABLE;
 
 exports.ISOLATION_READ_UNCOMMITTED = ISOLATION_READ_UNCOMMITTED;
-exports.ISOLATION_READ_COMMITED = ISOLATION_READ_COMMITED;
+exports.ISOLATION_READ_COMMITTED = ISOLATION_READ_COMMITTED;
 exports.ISOLATION_REPEATABLE_READ = ISOLATION_REPEATABLE_READ;
 exports.ISOLATION_SERIALIZABLE = ISOLATION_SERIALIZABLE;
-exports.ISOLATION_READ_COMMITED_READ_ONLY = ISOLATION_READ_COMMITED_READ_ONLY;
+exports.ISOLATION_READ_COMMITTED_READ_ONLY = ISOLATION_READ_COMMITTED_READ_ONLY;
 
 if (!String.prototype.padLeft) {
     String.prototype.padLeft = function(max, c) {
@@ -3230,81 +3230,60 @@ function decodeResponse(data, callback, cnx, lowercase_keys, cb) {
                 data.frows = data.frows || [];
 
                 if (custom.asObject && !data.fcols) {
-                    data.fcols = [];
-                    for (var i = 0, length = output.length; i < length; i++) {
-                        data.fcols.push(lowercase_keys ? output[i].alias.toLowerCase() : output[i].alias);
+                    if (lowercase_keys) {
+                        data.fcols = output.map((column) => column.alias.toLowerCase());
+                    } else {
+                        data.fcols = output.map((column) => column.alias);
                     }
                 }
 
                 const arrBlob = [];
+                const lowerV13 = statement.connection.accept.protocolVersion < PROTOCOL_VERSION13;
 
                 while (data.fcount && (data.fstatus !== 100)) {
-                    var lowerV13 = statement.connection.accept.protocolVersion < PROTOCOL_VERSION13;
-
-                    if (lowerV13) {
-                        for (length = output.length; data.fcolumn < length; data.fcolumn++) {
-                            item = output[data.fcolumn];
-
-                            try {
-                                _xdrpos = data.pos;
-                                const key = custom.asObject ? data.fcols[data.fcolumn] : data.fcolumn;
-                                const row = data.frows.length;
-                                let value = item.decode(data, lowerV13);
-                                if (item.type === SQL_BLOB && value !== null) {
-                                    if (item.subType === isc_blob_text && cnx.options.blobAsText) {
-                                        value = fetch_blob_async_transaction(statement, value, key, row);
-                                        arrBlob.push(value);
-                                    } else {
-                                        value = fetch_blob_async(statement, value, key, row);
-                                    }
-                                }
-                                data.frow[key] = value;
-                            } catch (e) {
-                                // uncomplete packet read
-                                data.pos = _xdrpos;
-                                data.r = r;
-                                return cb(new Error("Packet is not complete"));
+                    let nullBitSet;
+                    if (!lowerV13) {
+                        const nullBitsLen = Math.floor((output.length + 7) / 8);
+                        nullBitSet = new BitSet(data.readBuffer(nullBitsLen, false));
+                        data.readBuffer((4 - nullBitsLen) & 3, false); // Skip padding
+                    }
+
+                    for (length = output.length; data.fcolumn < length; data.fcolumn++) {
+                        item = output[data.fcolumn];
+                        
+                        if (!lowerV13 && nullBitSet.get(data.fcolumn)) {
+                            if (custom.asObject) {
+                                data.frow[data.fcols[data.fcolumn]] = null;
+                            } else {
+                                data.frow[data.fcolumn] = null;
                             }
 
+                            continue;
                         }
-                    } else {
-                        var nullBitsLen = Math.floor((output.length + 7) / 8);
-                        var nullBitSet = new BitSet(data.readBuffer(nullBitsLen, false));
-                        data.readBuffer((4 - nullBitsLen) & 3, false); // Skip padding
 
-                        for (length = output.length; data.fcolumn < length; data.fcolumn++) {
-                            item = output[data.fcolumn];
+                        try {
+                            _xdrpos = data.pos;
+                            const key = custom.asObject ? data.fcols[data.fcolumn] : data.fcolumn;
+                            const row = data.frows.length;
+                            let value = item.decode(data, lowerV13);
 
-                            if (nullBitSet.get(data.fcolumn)) {
-                                if (custom.asObject) {
-                                    data.frow[data.fcols[data.fcolumn]] = null;
+                            if (item.type === SQL_BLOB && value !== null) {
+                                if (item.subType === isc_blob_text && cnx.options.blobAsText) {
+                                    value = fetch_blob_async_transaction(statement, value, key, row);
+                                    arrBlob.push(value);
                                 } else {
-                                    data.frow[data.fcolumn] = null;
+                                    value = fetch_blob_async(statement, value, key, row);
                                 }
-
-                                continue;
                             }
 
-                            try {
-                                _xdrpos = data.pos;
-                                var key = custom.asObject ? data.fcols[data.fcolumn] : data.fcolumn;
-                                var value = item.decode(data, lowerV13);
-                                if (item.type === SQL_BLOB && value !== null) {
-                                    if (item.subType === isc_blob_text && cnx.options.blobAsText) {
-                                        value = fetch_blob_async_transaction(statement, value, key, data);
-                                        arrBlob.push(value);
-                                    } else {
-                                        value = fetch_blob_async(statement, value, key);
-                                    }
-                                }
-                                data.frow[key] = value;
-                            } catch (e) {
-                                // uncomplete packet read
-                                data.pos = _xdrpos;
-                                data.r = r;
-                                return cb(new Error("Packet is not complete"));
-                            }
+                            data.frow[key] = value;
+                        } catch (e) {
+                            // uncomplete packet read
+                            data.pos = _xdrpos;
+                            data.r = r;
+                            return cb(new Error('Packet is not complete'));
                         }
+
                     }
 
                     data.fcolumn = 0;
@@ -4466,12 +4445,8 @@ Connection.prototype.sendExecute = function (op, statement, transaction, callbac
 	this._queueEvent(callback);
 }
 
-function fetch_blob_async_transaction(statement, id, name, row) {
-    const infoValue = {
-        row,
-        column: name,
-        value: ''
-    };
+function fetch_blob_async_transaction(statement, id, column, row) {
+    const infoValue = { row, column, value: '' };
 
     return (transactionArg) => {
         const singleTransaction = transactionArg === undefined;

package/package.json

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