Read constants from both MySQL 5 and 8

Author: ARitz-Cracker

tool/generate-error-constants.js

@@ -3,16 +3,18 @@ var fs     = require('fs');
 var path   = require('path');
 var script = path.basename(__filename);
 
-var srcDir = process.argv[2];
-if (!srcDir) {
+var srcDir5 = process.argv[2];
+var srcDir8 = process.argv[3];
+if (!srcDir5 || !srcDir8) {
   var args = [];
   args[0] = process.argv[0].indexOf(' ') !== -1
     ? '"' + process.argv[0] + '"'
     : process.argv[0];
   args[1] = process.argv[1].indexOf(' ') !== -1
     ? '"' + process.argv[1] + '"'
     : process.argv[1];
-  args[2] = path.join('path', 'to', 'mysql', 'src');
+  args[2] = path.join('path', 'to', 'mysql5', 'src');
+  args[3] = path.join('path', 'to', 'mysql8', 'src');
   console.error('Usage: ' + args.join(' '));
   process.exit(1);
 }
@@ -21,14 +23,26 @@ var codes      = [];
 var targetFile = path.join(__dirname, '..', 'lib', 'protocol', 'constants', 'errors.js');
 var previous   = fs.existsSync(targetFile) ? require(targetFile) : {};
 var stream     = fs.createWriteStream(targetFile);
-var version    = extractMySqlVersion(srcDir);
+var version5   = extractMySqlVersion(srcDir5);
+if (!version5.startsWith('5.')){
+  console.error('Expected ' + srcDir5 + ' to contain MySQL 5.x.x sources, got ' + version5);
+  process.exit(1);
+}
+var version8   = extractMySqlVersion(srcDir8);
+if (!version8.startsWith('8.')){
+  console.error('Expected ' + srcDir5 + ' to contain MySQL 8.x.x sources, got ' + version8);
+  process.exit(1);
+}
 
-appendGlobalErrorCodes(srcDir, codes);
-appendDatabseErrorCodes(srcDir, codes);
-appendSqlErrorCodes(srcDir, codes);
+appendGlobalErrorCodes(srcDir5, codes);
+appendGlobalErrorCodes(srcDir8, codes);
+appendDatabseErrorCodes(srcDir5, codes);
+appendDatabseErrorCodes(srcDir8, codes);
+appendSqlErrorCodes(srcDir5, codes, path.join(srcDir5, 'sql', 'share', 'errmsg-utf8.txt'));
+appendSqlErrorCodes(srcDir8, codes, path.join(srcDir8, 'share', 'messages_to_clients.txt'));
 keepUnusedCodes(previous, codes);
 
-stream.write('/**\n * MySQL error constants\n *\n * Extracted from version ' + version + '\n *\n * !! Generated by ' + script + ', do not modify by hand !!\n */\n\n');
+stream.write('/**\n * MySQL error constants\n *\n * Extracted from versions ' + version5 + ' and ' + version8 + '\n *\n * !! Generated by ' + script + ', do not modify by hand !!\n */\n\n');
 
 var alignment = codes.reduce(maxLength, 0);
 for (var i = 0; i < codes.length; i++) {
@@ -48,6 +62,12 @@ for (var i = 0; i < codes.length; i++) {
 
 console.log('Wrote constants to ' + targetFile);
 
+function keepOldDefinitionIfMarkedObsolete(codes, num, code) {
+  if (!codes[num] || !code.startsWith('OBSOLETE_')) {
+    codes[num] = code;
+  }
+}
+
 function appendGlobalErrorCodes(srcDir, codes) {
   var headerFile = path.join(srcDir, 'include', 'mysys_err.h');
   var code       = '';
@@ -70,7 +90,7 @@ function appendGlobalErrorCodes(srcDir, codes) {
       break;
     }
 
-    codes[num] = code;
+    keepOldDefinitionIfMarkedObsolete(codes, num, code);
   }
 
   return codes;
@@ -98,24 +118,22 @@ function appendDatabseErrorCodes(srcDir, codes) {
       break;
     }
 
-    codes[num] = code;
+    keepOldDefinitionIfMarkedObsolete(codes, num, code);
   }
 
   return codes;
 }
 
-function appendSqlErrorCodes(srcDir, codes) {
-  var errorFile = version.startsWith("5.") ?
-	path.join(srcDir, 'sql', 'share', 'errmsg-utf8.txt') : path.join(srcDir, 'share', 'messages_to_clients.txt');
-  var contents  = fs.readFileSync(errorFile, 'utf-8').replace(/^#.*$/gm,"");
+function appendSqlErrorCodes(srcDir, codes, errorFile) {
+  var contents  = fs.readFileSync(errorFile, 'utf-8').replace(/^#.*$/gm, '');
   var sections  = contents.split(/^start-error-number (\d+)$/m);
 
   for (var i = 1; i < sections.length; i += 2) {
     var offset = Number(sections[i]);
     var names  = sections[i + 1].match(/^([A-Z0-9_]+)/mg).map(fixupCode);
 
     for (var j = 0; j < names.length; j++) {
-      codes[offset + j] = names[j];
+      keepOldDefinitionIfMarkedObsolete(codes, offset + j, names[j]);
     }
   }