Avoid leaking TextRow/BinaryRow object outside the framework

Avoid leaking TextRow/BinaryRow object outside the framework by
returning a new object every time instead of returning this

Author: testn

lib/commands/query.js

@@ -238,7 +238,7 @@ class Query extends Command {
     }
     let row;
     try {
-      row = new this._rowParser(
+      row = this._rowParser(
         packet,
         this._fields[this._resultIndex],
         this.options,

lib/parsers/binary_parser.js

@@ -93,6 +93,8 @@ function compile(fields, options, config) {
 
   if (options.rowsAsArray) {
     parserFn(`const result = new Array(${fields.length});`);
+  } else {
+    parserFn("const result = {};");
   }
 
   const resultTables = {};
@@ -104,7 +106,7 @@ function compile(fields, options, config) {
     }
     resultTablesArray = Object.keys(resultTables);
     for (i = 0; i < resultTablesArray.length; i++) {
-      parserFn(`this[${helpers.srcEscape(resultTablesArray[i])}] = {};`);
+      parserFn(`result[${helpers.srcEscape(resultTablesArray[i])}] = {};`);
     }
   }
 
@@ -125,16 +127,16 @@ function compile(fields, options, config) {
 
     if (typeof options.nestTables === 'string') {
       tableName = helpers.srcEscape(fields[i].table);
-      lvalue = `this[${helpers.srcEscape(
+      lvalue = `result[${helpers.srcEscape(
         fields[i].table + options.nestTables + fields[i].name
       )}]`;
     } else if (options.nestTables === true) {
       tableName = helpers.srcEscape(fields[i].table);
-      lvalue = `this[${tableName}][${fieldName}]`;
+      lvalue = `result[${tableName}][${fieldName}]`;
     } else if (options.rowsAsArray) {
       lvalue = `result[${i.toString(10)}]`;
     } else {
-      lvalue = `this[${helpers.srcEscape(fields[i].name)}]`;
+      lvalue = `result[${helpers.srcEscape(fields[i].name)}]`;
     }
 
     // TODO: this used to be an optimisation ( if column marked as NOT_NULL don't include code to check null
@@ -158,9 +160,7 @@ function compile(fields, options, config) {
     }
   }
 
-  if (options.rowsAsArray) {
-    parserFn('return result;');
-  }
+  parserFn('return result;');
 
   parserFn('};')('})()');
 

lib/parsers/text_parser.js

@@ -111,6 +111,8 @@ function compile(fields, options, config) {
 
   if (options.rowsAsArray) {
     parserFn(`const result = new Array(${fields.length})`);
+  } else {
+    parserFn("const result = {}");
   }
 
   if (typeof options.typeCast === 'function') {
@@ -126,7 +128,7 @@ function compile(fields, options, config) {
     }
     resultTablesArray = Object.keys(resultTables);
     for (i = 0; i < resultTablesArray.length; i++) {
-      parserFn(`this[${helpers.srcEscape(resultTablesArray[i])}] = {};`);
+      parserFn(`result[${helpers.srcEscape(resultTablesArray[i])}] = {};`);
     }
   }
 
@@ -136,15 +138,15 @@ function compile(fields, options, config) {
     fieldName = helpers.srcEscape(fields[i].name);
     parserFn(`// ${fieldName}: ${typeNames[fields[i].columnType]}`);
     if (typeof options.nestTables === 'string') {
-      lvalue = `this[${helpers.srcEscape(
+      lvalue = `result[${helpers.srcEscape(
         fields[i].table + options.nestTables + fields[i].name
       )}]`;
     } else if (options.nestTables === true) {
-      lvalue = `this[${helpers.srcEscape(fields[i].table)}][${fieldName}]`;
+      lvalue = `result[${helpers.srcEscape(fields[i].table)}][${fieldName}]`;
     } else if (options.rowsAsArray) {
       lvalue = `result[${i.toString(10)}]`;
     } else {
-      lvalue = `this[${fieldName}]`;
+      lvalue = `result[${fieldName}]`;
     }
     const encodingExpr = `CharsetToEncoding[fields[${i}].characterSet]`;
     const readCode = readCodeFor(
@@ -167,9 +169,7 @@ function compile(fields, options, config) {
     }
   }
 
-  if (options.rowsAsArray) {
-    parserFn('return result;');
-  }
+  parserFn('return result;');
 
   parserFn('};')('})()');
 

test/integration/connection/test-multiple-results.js

@@ -113,8 +113,7 @@ function do_test(testIndex) {
       _numResults = 1;
     } else if (_rows.length > 0) {
       if (
-        _rows.constructor.name === 'Array' &&
-        _rows[0].constructor.name === 'TextRow'
+        _rows.constructor.name === 'Array'
       ) {
         _numResults = 1;
       }

test/unit/commands/test-query.js

@@ -9,11 +9,9 @@ const testQuery = new Query({}, (err, res) => {
   assert.equal(res, null);
 });
 
-testQuery._rowParser = class FailingRowParser {
-  constructor() {
-    throw testError;
-  }
-};
+testQuery._rowParser = function FailingRowParser() {
+  throw testError;
+}
 
 testQuery.row({
   isEOF: () => false