mysqlsyncr 1.0.78 → 1.0.82

package/dist/index.cjs

@@ -3201,6 +3201,71 @@ var findDifferences = function findDifferences(expected, current) {
       });
       continue;
     }
+
+    //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();
+    }
     var createTableSql = current.tables[_tableName].createSQL;
     if (createTableSql === contents.createSQL) {
       logger("Table ".concat(_tableName, " createSQL matches from json, skipping indexes, triggers, and fields"));
@@ -3234,11 +3299,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',
@@ -3250,16 +3315,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;
           });
@@ -3291,7 +3356,7 @@ var findDifferences = function findDifferences(expected, current) {
             });
           }
           if (field.Type !== currentField.Type) {
-            if (field.Type == 'int' && currentField.Type == 'int(11)') return 0; // continue
+            if (field.Type == 'int' && currentField.Type.startsWith('int(')) return 0; // continue
             // int(11) is the default for int and used on older versions of mysql
             if (field.Type == 'smallint' && currentField.Type.startsWith('smallint(')) return 0; // continue
             // smallint(6) is the default for smallint and used on older versions of mysql
@@ -3311,23 +3376,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(', ');
@@ -3363,19 +3428,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;
 
@@ -3392,71 +3457,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();
       }

package/dist/index.js

@@ -3198,6 +3198,71 @@ var findDifferences = function findDifferences(expected, current) {
       });
       continue;
     }
+
+    //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();
+    }
     var createTableSql = current.tables[_tableName].createSQL;
     if (createTableSql === contents.createSQL) {
       logger("Table ".concat(_tableName, " createSQL matches from json, skipping indexes, triggers, and fields"));
@@ -3231,11 +3296,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 +3312,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;
           });
@@ -3288,7 +3353,7 @@ var findDifferences = function findDifferences(expected, current) {
             });
           }
           if (field.Type !== currentField.Type) {
-            if (field.Type == 'int' && currentField.Type == 'int(11)') return 0; // continue
+            if (field.Type == 'int' && currentField.Type.startsWith('int(')) return 0; // continue
             // int(11) is the default for int and used on older versions of mysql
             if (field.Type == 'smallint' && currentField.Type.startsWith('smallint(')) return 0; // continue
             // smallint(6) is the default for smallint and used on older versions of mysql
@@ -3308,23 +3373,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 +3425,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 +3454,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();
       }

package/package.json

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

package/src/differences.js

@@ -22,6 +22,28 @@ export const findDifferences = (expected, current) => {
             continue;
         }
 
+        //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 });
+            }
+        }
+
         const createTableSql = current.tables[tableName].createSQL;
         if (createTableSql === contents.createSQL) {
             logger(`Table ${tableName} createSQL matches from json, skipping indexes, triggers, and fields`);
@@ -70,11 +92,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 == 'int(11)') 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 +134,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 });
-            }
-        }
+
     }