mysqlsyncr 1.0.80 → 1.0.84

package/dist/index.js

@@ -6,7 +6,6 @@ import path, { normalize, resolve, dirname, basename, extname, relative, join }
 import yargs from 'yargs';
 import { notStrictEqual, strictEqual } from 'assert';
 import { fileURLToPath } from 'url';
-import 'module';
 import fs, { readdir, mkdir } from 'fs/promises';
 import express from 'express';
 import http from 'http';
@@ -3188,7 +3187,14 @@ var findDifferences = function findDifferences(expected, current) {
       _tableName = _Object$entries$_i[0],
       contents = _Object$entries$_i[1];
     //check if craete table matches from json, if so, we dont need to compare indexes, triggers, or fields
-
+    var columns = contents.columns,
+      indexes = contents.indexes,
+      triggers = contents.triggers;
+      contents.createSQL;
+      contents.name;
+      contents.engine;
+      contents.charset;
+      contents.collate;
     if (!current.tables[_tableName]) {
       console.log('missing_table', contents);
       differences.push({
@@ -3198,6 +3204,74 @@ var findDifferences = function findDifferences(expected, current) {
       });
       continue;
     }
+    try {
+      //verify triggers
+      logger('Verifying triggers for table', _tableName);
+      var _iterator = _createForOfIteratorHelper(triggers),
+        _step;
+      try {
+        var _loop = function _loop() {
+          var trigger = _step.value;
+          var currentTrigger = current.tables[_tableName].triggers.find(function (t) {
+            return t.Name === trigger.Name;
+          });
+          if (!currentTrigger) {
+            logger('Missing trigger', trigger);
+            differences.push({
+              type: 'missing_trigger',
+              tableName: _tableName,
+              trigger: trigger
+            });
+          } else {
+            // Compare additional properties if needed
+            if (currentTrigger.Event !== trigger.Event || currentTrigger.Statement !== trigger.Statement) {
+              logger('Mismatched trigger', {
+                expected: trigger,
+                current: currentTrigger
+              });
+              differences.push({
+                type: 'mismatched_trigger',
+                tableName: _tableName,
+                trigger: trigger
+              });
+            }
+          }
+        };
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          _loop();
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      var _iterator2 = _createForOfIteratorHelper(current.tables[_tableName].triggers),
+        _step2;
+      try {
+        var _loop2 = function _loop2() {
+          var trigger = _step2.value;
+          if (!triggers.some(function (t) {
+            return t.Name === trigger.Name;
+          })) {
+            logger('Extra trigger', trigger);
+            differences.push({
+              type: 'extra_trigger',
+              tableName: _tableName,
+              trigger: trigger
+            });
+          }
+        };
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          _loop2();
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+    } catch (e) {
+      console.error("Error verifying triggers for table ".concat(_tableName), e);
+    }
     var createTableSql = current.tables[_tableName].createSQL;
     if (createTableSql === contents.createSQL) {
       logger("Table ".concat(_tableName, " createSQL matches from json, skipping indexes, triggers, and fields"));
@@ -3207,14 +3281,6 @@ var findDifferences = function findDifferences(expected, current) {
       logger(createTableSql);
       logger(contents.createSQL);
     }
-    var columns = contents.columns,
-      indexes = contents.indexes,
-      triggers = contents.triggers;
-      contents.createSQL;
-      contents.name;
-      contents.engine;
-      contents.charset;
-      contents.collate;
     current.tables[_tableName].columns.map(function (f) {
       return f.Field;
     });
@@ -3231,11 +3297,11 @@ var findDifferences = function findDifferences(expected, current) {
 
     logger('Detecting extra fields for table', _tableName);
     // Detect extra fields
-    var _iterator = _createForOfIteratorHelper(current.tables[_tableName].columns),
-      _step;
+    var _iterator3 = _createForOfIteratorHelper(current.tables[_tableName].columns),
+      _step3;
     try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var field = _step.value;
+      for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+        var field = _step3.value;
         if (!expectedFieldNames.includes(field.Field)) {
           differences.push({
             type: 'extra_field',
@@ -3247,16 +3313,16 @@ var findDifferences = function findDifferences(expected, current) {
 
       // verify Type Null and Default
     } catch (err) {
-      _iterator.e(err);
+      _iterator3.e(err);
     } finally {
-      _iterator.f();
+      _iterator3.f();
     }
     logger('Verifying Type Null and Default for table', _tableName);
-    var _iterator2 = _createForOfIteratorHelper(columns),
-      _step2;
+    var _iterator4 = _createForOfIteratorHelper(columns),
+      _step4;
     try {
-      var _loop = function _loop() {
-          var field = _step2.value;
+      var _loop3 = function _loop3() {
+          var field = _step4.value;
           var currentField = current.tables[_tableName].columns.find(function (f) {
             return f.Field === field.Field;
           });
@@ -3308,23 +3374,23 @@ var findDifferences = function findDifferences(expected, current) {
           }
         },
         _ret;
-      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-        _ret = _loop();
+      for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+        _ret = _loop3();
         if (_ret === 0) continue;
       }
 
       // verify indexes
     } catch (err) {
-      _iterator2.e(err);
+      _iterator4.e(err);
     } finally {
-      _iterator2.f();
+      _iterator4.f();
     }
     logger('Verifying indexes for table', _tableName);
-    var _iterator3 = _createForOfIteratorHelper(indexes),
-      _step3;
+    var _iterator5 = _createForOfIteratorHelper(indexes),
+      _step5;
     try {
-      var _loop2 = function _loop2() {
-        var index = _step3.value;
+      var _loop4 = function _loop4() {
+        var index = _step5.value;
         // Check if the current index matches the expected index structure
         var currentIndex = current.tables[_tableName].indexes.find(function (i) {
           return i.ColumnName.sort().join(', ') === index.ColumnName.sort().join(', ');
@@ -3360,19 +3426,19 @@ var findDifferences = function findDifferences(expected, current) {
           }
         }
       };
-      for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-        _loop2();
+      for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+        _loop4();
       }
     } catch (err) {
-      _iterator3.e(err);
+      _iterator5.e(err);
     } finally {
-      _iterator3.f();
+      _iterator5.f();
     }
-    var _iterator4 = _createForOfIteratorHelper(current.tables[_tableName].indexes),
-      _step4;
+    var _iterator6 = _createForOfIteratorHelper(current.tables[_tableName].indexes),
+      _step6;
     try {
-      var _loop3 = function _loop3() {
-        var index = _step4.value;
+      var _loop5 = function _loop5() {
+        var index = _step6.value;
         logger('Checking index', index);
         var indexFound = false;
 
@@ -3389,71 +3455,6 @@ var findDifferences = function findDifferences(expected, current) {
           });
         }
       };
-      for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-        _loop3();
-      }
-
-      //verify triggers
-    } catch (err) {
-      _iterator4.e(err);
-    } finally {
-      _iterator4.f();
-    }
-    logger('Verifying triggers for table', _tableName);
-    var _iterator5 = _createForOfIteratorHelper(triggers),
-      _step5;
-    try {
-      var _loop4 = function _loop4() {
-        var trigger = _step5.value;
-        var currentTrigger = current.tables[_tableName].triggers.find(function (t) {
-          return t.Name === trigger.Name;
-        });
-        if (!currentTrigger) {
-          logger('Missing trigger', trigger);
-          differences.push({
-            type: 'missing_trigger',
-            tableName: _tableName,
-            trigger: trigger
-          });
-        } else {
-          // Compare additional properties if needed
-          if (currentTrigger.Event !== trigger.Event || currentTrigger.Statement !== trigger.Statement) {
-            logger('Mismatched trigger', {
-              expected: trigger,
-              current: currentTrigger
-            });
-            differences.push({
-              type: 'mismatched_trigger',
-              tableName: _tableName,
-              trigger: trigger
-            });
-          }
-        }
-      };
-      for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-        _loop4();
-      }
-    } catch (err) {
-      _iterator5.e(err);
-    } finally {
-      _iterator5.f();
-    }
-    var _iterator6 = _createForOfIteratorHelper(current.tables[_tableName].triggers),
-      _step6;
-    try {
-      var _loop5 = function _loop5() {
-        var trigger = _step6.value;
-        if (!triggers.some(function (t) {
-          return t.Name === trigger.Name;
-        })) {
-          logger('Extra trigger', trigger);
-          differences.push({
-            type: 'extra_trigger',
-            tableName: _tableName,
-            trigger: trigger
-          });
-        }
-      };
       for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
         _loop5();
       }
@@ -4058,12 +4059,12 @@ var compareAllDatabases = /*#__PURE__*/function () {
           expectedDatabases = expectedDatabases.filter(function (file) {
             return file !== 'dumpInfo.json';
           });
-          // console.log('Expected databases from input directory:', expectedDatabases);
+          console.log('Expected databases from input directory:', expectedDatabases);
 
           // Check existing databases
-          _context.next = 13;
+          _context.next = 14;
           return getDatabases(connection);
-        case 13:
+        case 14:
           existingDatabases = _context.sent;
           // console.log('Existing databases:', existingDatabases);
           allDifferences = {};
@@ -4072,20 +4073,20 @@ var compareAllDatabases = /*#__PURE__*/function () {
 
           // Note missing databases and prepare to create them
           _iterator = _createForOfIteratorHelper(expectedDatabases);
-          _context.prev = 18;
+          _context.prev = 19;
           _iterator.s();
-        case 20:
+        case 21:
           if ((_step = _iterator.n()).done) {
-            _context.next = 27;
+            _context.next = 28;
             break;
           }
           _database = _step.value;
           if (!(options && options.database && options.database !== _database)) {
-            _context.next = 24;
+            _context.next = 25;
             break;
           }
-          return _context.abrupt("continue", 25);
-        case 24:
+          return _context.abrupt("continue", 26);
+        case 25:
           if (!existingDatabases.includes(_database)) {
             allDifferences[_database] = [{
               database: _database,
@@ -4094,58 +4095,58 @@ var compareAllDatabases = /*#__PURE__*/function () {
             }];
             missingDatabases.push(_database);
           }
-        case 25:
-          _context.next = 20;
+        case 26:
+          _context.next = 21;
           break;
-        case 27:
-          _context.next = 32;
+        case 28:
+          _context.next = 33;
           break;
-        case 29:
-          _context.prev = 29;
-          _context.t0 = _context["catch"](18);
+        case 30:
+          _context.prev = 30;
+          _context.t0 = _context["catch"](19);
           _iterator.e(_context.t0);
-        case 32:
-          _context.prev = 32;
+        case 33:
+          _context.prev = 33;
           _iterator.f();
-          return _context.finish(32);
-        case 35:
+          return _context.finish(33);
+        case 36:
           if (!(missingDatabases.length > 0 && update)) {
-            _context.next = 58;
+            _context.next = 59;
             break;
           }
           console.log('Creating missing databases:');
           _iterator2 = _createForOfIteratorHelper(missingDatabases);
-          _context.prev = 38;
+          _context.prev = 39;
           _iterator2.s();
-        case 40:
+        case 41:
           if ((_step2 = _iterator2.n()).done) {
-            _context.next = 48;
+            _context.next = 49;
             break;
           }
           database = _step2.value;
           console.log("Creating database ".concat(database, "..."));
-          _context.next = 45;
+          _context.next = 46;
           return connection.query("CREATE DATABASE `".concat(database, "`;"));
-        case 45:
-          console.log("Database ".concat(database, " created."));
         case 46:
-          _context.next = 40;
+          console.log("Database ".concat(database, " created."));
+        case 47:
+          _context.next = 41;
           break;
-        case 48:
-          _context.next = 53;
+        case 49:
+          _context.next = 54;
           break;
-        case 50:
-          _context.prev = 50;
-          _context.t1 = _context["catch"](38);
+        case 51:
+          _context.prev = 51;
+          _context.t1 = _context["catch"](39);
           _iterator2.e(_context.t1);
-        case 53:
-          _context.prev = 53;
+        case 54:
+          _context.prev = 54;
           _iterator2.f();
-          return _context.finish(53);
-        case 56:
-          _context.next = 59;
+          return _context.finish(54);
+        case 57:
+          _context.next = 60;
           break;
-        case 58:
+        case 59:
           if (missingDatabases.length > 0 && !update) {
             console.error('Missing databases found but update is not enabled. Please enable update to create missing databases.');
             console.error('Please run the command again with the --update flag to create missing databases.');
@@ -4154,87 +4155,87 @@ var compareAllDatabases = /*#__PURE__*/function () {
           } else {
             console.log('All expected databases exist.');
           }
-        case 59:
+        case 60:
           _iterator3 = _createForOfIteratorHelper(expectedDatabases);
-          _context.prev = 60;
+          _context.prev = 61;
           _iterator3.s();
-        case 62:
+        case 63:
           if ((_step3 = _iterator3.n()).done) {
-            _context.next = 100;
+            _context.next = 101;
             break;
           }
           _database2 = _step3.value;
           if (!(options && options.database && options.database !== _database2)) {
-            _context.next = 66;
+            _context.next = 67;
             break;
           }
-          return _context.abrupt("continue", 98);
-        case 66:
+          return _context.abrupt("continue", 99);
+        case 67:
           if (!missingDatabases.includes(_database2)) {
-            _context.next = 69;
+            _context.next = 70;
             break;
           }
           console.log('Skipping database', _database2, 'because it is missing');
-          return _context.abrupt("continue", 98);
-        case 69:
+          return _context.abrupt("continue", 99);
+        case 70:
           filePath = path.join(inputDir, _database2, "".concat(_database2, ".json"));
-          _context.prev = 70;
-          _context.next = 73;
+          _context.prev = 71;
+          _context.next = 74;
           return fs.readFile(filePath, 'utf-8');
-        case 73:
+        case 74:
           fileContent = _context.sent;
           expectedStructure = JSON.parse(fileContent);
           console.log('Getting database structure for', _database2);
-          _context.next = 78;
+          _context.next = 79;
           return getDatabaseStructure(connection, _database2, command, options);
-        case 78:
+        case 79:
           currentStructure = _context.sent;
           console.log('Database structure for', _database2, 'obtained');
           differences = findDifferences(expectedStructure, currentStructure);
           console.log('Differences for', _database2, 'obtained');
           if (update) {
-            _context.next = 87;
+            _context.next = 88;
             break;
           }
           console.log('Logging differences for', _database2);
           logDifferences(differences, _database2, true);
-          _context.next = 92;
+          _context.next = 93;
           break;
-        case 87:
+        case 88:
           console.log('Logging differences for', _database2);
           logDifferences(differences, _database2, false);
           console.log('Applying differences for', _database2);
-          _context.next = 92;
+          _context.next = 93;
           return applyDifferences(connection, _database2, differences);
-        case 92:
+        case 93:
           allDifferences[_database2] = differences;
-          _context.next = 98;
+          _context.next = 99;
           break;
-        case 95:
-          _context.prev = 95;
-          _context.t2 = _context["catch"](70);
+        case 96:
+          _context.prev = 96;
+          _context.t2 = _context["catch"](71);
           console.error("Error processing database ".concat(_database2, ":"), _context.t2.message);
-        case 98:
-          _context.next = 62;
+        case 99:
+          _context.next = 63;
           break;
-        case 100:
-          _context.next = 105;
+        case 101:
+          _context.next = 106;
           break;
-        case 102:
-          _context.prev = 102;
-          _context.t3 = _context["catch"](60);
+        case 103:
+          _context.prev = 103;
+          _context.t3 = _context["catch"](61);
           _iterator3.e(_context.t3);
-        case 105:
-          _context.prev = 105;
+        case 106:
+          _context.prev = 106;
           _iterator3.f();
-          return _context.finish(105);
-        case 108:
-          return _context.abrupt("return", allDifferences);
+          return _context.finish(106);
         case 109:
+          return _context.abrupt("return", allDifferences);
+        case 110:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[18, 29, 32, 35], [38, 50, 53, 56], [60, 102, 105, 108], [70, 95]]);
+    }, _callee, null, [[19, 30, 33, 36], [39, 51, 54, 57], [61, 103, 106, 109], [71, 96]]);
   }));
   return function compareAllDatabases(_x, _x2) {
     return _ref.apply(this, arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mysqlsyncr",
-  "version": "1.0.80",
+  "version": "1.0.84",
   "description": "",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",

package/src/compare.js

@@ -15,7 +15,7 @@ export const compareAllDatabases = async (connection, inputDir, update = false,
     expectedDatabases = expectedDatabases.filter(file => file !== 'diffs.json');
     //filter out dumpInfo.json
     expectedDatabases = expectedDatabases.filter(file => file !== 'dumpInfo.json');
-    // console.log('Expected databases from input directory:', expectedDatabases);
+    console.log('Expected databases from input directory:', expectedDatabases);
 
     // Check existing databases
     const existingDatabases = await getDatabases(connection);

package/src/differences.js

@@ -15,12 +15,39 @@ export const findDifferences = (expected, current) => {
     if (!expected.tables) throw new Error('No tables found in expected');
     for (const [tableName, contents] of Object.entries(expected.tables)) {
         //check if craete table matches from json, if so, we dont need to compare indexes, triggers, or fields
+        const { columns, indexes, triggers, createSQL, name, engine, charset, collate } = contents;
+
 
         if (!current.tables[tableName]) {
             console.log('missing_table', contents);
             differences.push({ type: 'missing_table', tableName, createSQL: contents.createSQL });
             continue;
         }
+        try {
+            //verify triggers
+            logger('Verifying triggers for table', tableName);
+            for (const trigger of triggers) {
+                const currentTrigger = current.tables[tableName].triggers.find(t => t.Name === trigger.Name);
+                if (!currentTrigger) {
+                    logger('Missing trigger', trigger);
+                    differences.push({ type: 'missing_trigger', tableName, trigger });
+                } else {
+                    // Compare additional properties if needed
+                    if (currentTrigger.Event !== trigger.Event || currentTrigger.Statement !== trigger.Statement) {
+                        logger('Mismatched trigger', { expected: trigger, current: currentTrigger });
+                        differences.push({ type: 'mismatched_trigger', tableName, trigger });
+                    }
+                }
+            }
+            for (const trigger of current.tables[tableName].triggers) {
+                if (!triggers.some(t => t.Name === trigger.Name)) {
+                    logger('Extra trigger', trigger);
+                    differences.push({ type: 'extra_trigger', tableName, trigger });
+                }
+            }
+        } catch (e) {
+            console.error(`Error verifying triggers for table ${tableName}`, e);
+        }
 
         const createTableSql = current.tables[tableName].createSQL;
         if (createTableSql === contents.createSQL) {
@@ -31,7 +58,6 @@ export const findDifferences = (expected, current) => {
             logger(createTableSql);
             logger(contents.createSQL);
         }
-        const { columns, indexes, triggers, createSQL, name, engine, charset, collate } = contents;
 
 
         const currentFieldNames = current.tables[tableName].columns.map(f => f.Field);
@@ -70,11 +96,11 @@ export const findDifferences = (expected, current) => {
                 differences.push({ type: 'mismatched_field', info: "Default", tableName, field, currentField });
             }
             if (field.Type !== currentField.Type) {
-                if(field.Type == 'int' && currentField.Type.startsWith('int(')) continue; // int(11) is the default for int and used on older versions of mysql
-                if(field.Type == 'smallint' && currentField.Type.startsWith('smallint(')) continue; // smallint(6) is the default for smallint and used on older versions of mysql
-                if(field.Type == 'tinyint' && currentField.Type.startsWith('tinyint(')) continue; // tinyint(1) is the default for tinyint and used on older versions of mysql
-                if(field.Type == 'varchar' && currentField.Type.startsWith('varchar(')) continue; // varchar(255) is the default for varchar and used on older versions of mysql
-                if(field.Type == 'bigint' && currentField.Type.startsWith('bigint(')) continue; // bigint(20) is the default for bigint and used on older versions of mysql
+                if (field.Type == 'int' && currentField.Type.startsWith('int(')) continue; // int(11) is the default for int and used on older versions of mysql
+                if (field.Type == 'smallint' && currentField.Type.startsWith('smallint(')) continue; // smallint(6) is the default for smallint and used on older versions of mysql
+                if (field.Type == 'tinyint' && currentField.Type.startsWith('tinyint(')) continue; // tinyint(1) is the default for tinyint and used on older versions of mysql
+                if (field.Type == 'varchar' && currentField.Type.startsWith('varchar(')) continue; // varchar(255) is the default for varchar and used on older versions of mysql
+                if (field.Type == 'bigint' && currentField.Type.startsWith('bigint(')) continue; // bigint(20) is the default for bigint and used on older versions of mysql
                 differences.push({ type: 'mismatched_field', info: "Type", tableName, field, currentField });
             }
         }
@@ -112,27 +138,7 @@ export const findDifferences = (expected, current) => {
             }
         }
 
-        //verify triggers
-        logger('Verifying triggers for table', tableName);
-        for (const trigger of triggers) {
-            const currentTrigger = current.tables[tableName].triggers.find(t => t.Name === trigger.Name);
-            if (!currentTrigger) {
-                logger('Missing trigger', trigger);
-                differences.push({ type: 'missing_trigger', tableName, trigger });
-            } else {
-                // Compare additional properties if needed
-                if (currentTrigger.Event !== trigger.Event || currentTrigger.Statement !== trigger.Statement) {
-                    logger('Mismatched trigger', { expected: trigger, current: currentTrigger });
-                    differences.push({ type: 'mismatched_trigger', tableName, trigger });
-                }
-            }
-        }
-        for (const trigger of current.tables[tableName].triggers) {
-            if (!triggers.some(t => t.Name === trigger.Name)) {
-                logger('Extra trigger', trigger);
-                differences.push({ type: 'extra_trigger', tableName, trigger });
-            }
-        }
+
     }
 
 

package/src/dump.js

@@ -1,4 +1,3 @@
-import { createRequire } from 'module';
 import fs from 'fs/promises';
 import path from 'path';
 import { getDatabases, getDatabaseStructure } from './getters.js';