mysql2 3.9.4 → 3.9.6

package/lib/helpers.js

@@ -16,7 +16,7 @@
   */
 function srcEscape(str) {
   return JSON.stringify({
-    [str]: 1
+    [str]: 1,
   }).slice(1, -3);
 }
 
@@ -29,7 +29,7 @@ try {
   const REQUIRE_TERMINATOR = '';
   highlightFn = require(`cardinal${REQUIRE_TERMINATOR}`).highlight;
 } catch (err) {
-  highlightFn = text => {
+  highlightFn = (text) => {
     if (!cardinalRecommended) {
       // eslint-disable-next-line no-console
       console.log('For nicer debug output consider install cardinal@^2.0.0');
@@ -56,10 +56,20 @@ exports.printDebugWithCode = printDebugWithCode;
  */
 function typeMatch(type, list, Types) {
   if (Array.isArray(list)) {
-    return list.some(t => type === Types[t]);
+    return list.some((t) => type === Types[t]);
   }
 
   return !!list;
 }
 
 exports.typeMatch = typeMatch;
+
+const privateObjectProps = new Set([
+  '__defineGetter__',
+  '__defineSetter__',
+  '__lookupGetter__',
+  '__lookupSetter__',
+  '__proto__',
+]);
+
+exports.privateObjectProps = privateObjectProps;

package/lib/parsers/binary_parser.js

@@ -122,13 +122,7 @@ function compile(fields, options, config) {
   if (options.rowsAsArray) {
     parserFn(`const result = new Array(${fields.length});`);
   } else {
-    parserFn('const result = Object.create(null);');
-    parserFn(`Object.defineProperty(result, "constructor", {
-      value: Object.create(null),
-      writable: false,
-      configurable: false,
-      enumerable: false
-    });`);
+    parserFn('const result = {};');
   }
 
   // Global typeCast
@@ -152,6 +146,13 @@ function compile(fields, options, config) {
 
   for (let i = 0; i < fields.length; i++) {
     fieldName = helpers.srcEscape(fields[i].name);
+
+    if (helpers.privateObjectProps.has(fields[i].name)) {
+      throw new Error(
+        `The field name (${fieldName}) can't be the same as an object's private property.`,
+      );
+    }
+
     parserFn(`// ${fieldName}: ${typeNames[fields[i].columnType]}`);
 
     if (typeof options.nestTables === 'string') {
@@ -160,9 +161,7 @@ function compile(fields, options, config) {
       )}]`;
     } else if (options.nestTables === true) {
       tableName = helpers.srcEscape(fields[i].table);
-      parserFn(
-        `if (!result[${tableName}]) result[${tableName}] = Object.create(null);`,
-      );
+      parserFn(`if (!result[${tableName}]) result[${tableName}] = {};`);
       lvalue = `result[${tableName}][${fieldName}]`;
     } else if (options.rowsAsArray) {
       lvalue = `result[${i.toString(10)}]`;
@@ -170,6 +169,10 @@ function compile(fields, options, config) {
       lvalue = `result[${fieldName}]`;
     }
 
+    parserFn(`if (nullBitmaskByte${nullByteIndex} & ${currentFieldNullBit}) `);
+    parserFn(`${lvalue} = null;`);
+    parserFn('else {');
+
     if (options.typeCast === false) {
       parserFn(`${lvalue} = packet.readLengthCodedBuffer();`);
     } else {
@@ -177,9 +180,6 @@ function compile(fields, options, config) {
       parserFn(`const ${fieldWrapperVar} = wrap(fields[${i}], packet);`);
       const readCode = readCodeFor(fields[i], config, options, i);
 
-      parserFn(`if (nullBitmaskByte${nullByteIndex} & ${currentFieldNullBit})`);
-      parserFn(`${lvalue} = null;`);
-      parserFn('else {');
       if (typeof options.typeCast === 'function') {
         parserFn(
           `${lvalue} = options.typeCast(${fieldWrapperVar}, function() { return ${readCode} });`,
@@ -187,8 +187,9 @@ function compile(fields, options, config) {
       } else {
         parserFn(`${lvalue} = ${readCode};`);
       }
-      parserFn('}');
     }
+    parserFn('}');
+
 
     currentFieldNullBit *= 2;
     if (currentFieldNullBit === 0x100) {

package/lib/parsers/text_parser.js

@@ -131,13 +131,7 @@ function compile(fields, options, config) {
   if (options.rowsAsArray) {
     parserFn(`const result = new Array(${fields.length});`);
   } else {
-    parserFn('const result = Object.create(null);');
-    parserFn(`Object.defineProperty(result, "constructor", {
-      value: Object.create(null),
-      writable: false,
-      configurable: false,
-      enumerable: false
-    });`);
+    parserFn('const result = {};');
   }
 
   const resultTables = {};
@@ -149,9 +143,7 @@ function compile(fields, options, config) {
     }
     resultTablesArray = Object.keys(resultTables);
     for (let i = 0; i < resultTablesArray.length; i++) {
-      parserFn(
-        `result[${helpers.srcEscape(resultTablesArray[i])}] = Object.create(null);`,
-      );
+      parserFn(`result[${helpers.srcEscape(resultTablesArray[i])}] = {};`);
     }
   }
 
@@ -159,6 +151,13 @@ function compile(fields, options, config) {
   let fieldName = '';
   for (let i = 0; i < fields.length; i++) {
     fieldName = helpers.srcEscape(fields[i].name);
+
+    if (helpers.privateObjectProps.has(fields[i].name)) {
+      throw new Error(
+        `The field name (${fieldName}) can't be the same as an object's private property.`,
+      );
+    }
+
     parserFn(`// ${fieldName}: ${typeNames[fields[i].columnType]}`);
     if (typeof options.nestTables === 'string') {
       lvalue = `result[${helpers.srcEscape(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mysql2",
-  "version": "3.9.4",
+  "version": "3.9.6",
   "description": "fast mysql driver. Implements core protocol, prepared statements, ssl and compression in native JS",
   "main": "index.js",
   "typings": "typings/mysql/index",