calculate encoding dynamically as it can change between execution of cached parsers

Author: sidorares

lib/compile_binary_parser.js

@@ -15,7 +15,7 @@ function compile (fields, options, config) {
   var result = [];
   var i = 0;
   var nullBitmapLength = Math.floor((fields.length + 7 + 2) / 8);
-  result.push('(function(){ return function BinaryRow(packet) {');
+  result.push('(function(){ return function BinaryRow(packet, fields, options, CharsetToEncoding) {');
 
   if (options.rowsAsArray) {
     result.push('  var result = new Array(' + fields.length + ');');
@@ -73,7 +73,7 @@ function compile (fields, options, config) {
     result.push('  if (nullBitmaskByte' + nullByteIndex + ' & ' + currentFieldNullBit + ')');
     result.push('  ' + lvalue + ' = null;');
     result.push('  else');
-    result.push('  ' + lvalue + ' = ' + readCodeFor(fields[i], config, options));
+    result.push('  ' + lvalue + ' = ' + readCodeFor(fields[i], config, options, i));
     // }
     currentFieldNullBit *= 2;
     if (currentFieldNullBit == 0x100) {
@@ -96,7 +96,7 @@ function compile (fields, options, config) {
   return vm.runInThisContext(src);
 }
 
-function readCodeFor (field, config, options) {
+function readCodeFor (field, config, options, fieldNum) {
   var supportBigNumbers = options.supportBigNumbers || config.supportBigNumbers;
   var bigNumberStrings = options.bigNumberStrings || config.bigNumberStrings;
   var unsigned = field.flags & FieldFlags.UNSIGNED;
@@ -135,7 +135,7 @@ function readCodeFor (field, config, options) {
   case Types.GEOMETRY:
     return 'packet.parseGeometryValue();';
   case Types.JSON:
-    return 'JSON.parse(packet.readLengthCodedString("' + CharsetToEncoding[field.characterSet] + '"));';
+    return 'JSON.parse(packet.readLengthCodedString(CharsetToEncoding[fields[' + fieldNum + '].characterSet]));';
   case Types.LONGLONG:
     if (!supportBigNumbers) {
       return unsigned ? 'packet.readInt64JSNumber();' : 'packet.readSInt64JSNumber();';
@@ -150,7 +150,7 @@ function readCodeFor (field, config, options) {
     if (field.characterSet == Charsets.BINARY) {
       return 'packet.readLengthCodedBuffer();';
     } else {
-      return 'packet.readLengthCodedString("' + CharsetToEncoding[field.characterSet] + '")';
+      return 'packet.readLengthCodedString(CharsetToEncoding[fields[' + fieldNum + '].characterSet])';
     }
   }
 }

lib/compile_text_parser.js

@@ -31,7 +31,7 @@ function compile (fields, options, config) {
   var i = 0;
   var lvalue = '';
 
-  result.push('(function() { return function TextRow(packet, fields, options) {');
+  result.push('(function() { return function TextRow(packet, fields, options, CharsetToEncoding) {');
   if (options.rowsAsArray) {
     result.push('  var result = new Array(' + fields.length + ')');
   }
@@ -74,10 +74,10 @@ function compile (fields, options, config) {
     } else {
       lvalue = '  this[' + srcEscape(fields[i].name) + ']';
     }
-    var encoding = CharsetToEncoding[fields[i].characterSet];
-    var readCode = readCodeFor(fields[i].columnType, fields[i].characterSet, encoding, config, options);
+    var encodingExpr = 'CharsetToEncoding[fields[' + i + '].characterSet]';
+    var readCode = readCodeFor(fields[i].columnType, fields[i].characterSet, encodingExpr, config, options);
     if (typeof options.typeCast === 'function') {
-      result.push(lvalue + ' = options.typeCast(wrap(fields[' + i + '], ' + srcEscape(typeNames[fields[i].columnType]) + ', packet, "' + encoding + '"), function() { return ' + readCode + ';})');
+      result.push(lvalue + ' = options.typeCast(wrap(fields[' + i + '], ' + srcEscape(typeNames[fields[i].columnType]) + ', packet, ' + encodingExpr + '), function() { return ' + readCode + ';})');
     } else if (options.typeCast === false) {
       result.push(lvalue + ' = packet.readLengthCodedBuffer();');
     } else {
@@ -100,7 +100,7 @@ function compile (fields, options, config) {
   return vm.runInThisContext(src);
 }
 
-function readCodeFor (type, charset, encoding, config, options) {
+function readCodeFor (type, charset, encodingExpr, config, options) {
   var supportBigNumbers = options.supportBigNumbers || config.supportBigNumbers;
   var bigNumberStrings = options.bigNumberStrings || config.bigNumberStrings;
 
@@ -143,12 +143,12 @@ function readCodeFor (type, charset, encoding, config, options) {
   case Types.GEOMETRY:
     return 'packet.parseGeometryValue()';
   case Types.JSON:
-    return 'JSON.parse(packet.readLengthCodedString("' + encoding + '"))';
+    return 'JSON.parse(packet.readLengthCodedString(' + encodingExpr + '))';
   default:
     if (charset == Charsets.BINARY) {
       return 'packet.readLengthCodedBuffer()';
     } else {
-      return 'packet.readLengthCodedString("' + encoding + '")';
+      return 'packet.readLengthCodedString(' + encodingExpr + ')';
     }
   }
 }