npm - mysqlsyncr - Versions diffs - 1.1.0 → 1.1.4 - Mend

mysqlsyncr 1.1.0 → 1.1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/dist/index.cjs CHANGED Viewed

@@ -3599,7 +3599,7 @@ var applyDifferences = /*#__PURE__*/function () {
           _iterator = _createForOfIteratorHelper(differences);
           _context2.prev = 2;
           _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop() {
-            var diff, createDatabaseSQL, tableName, createSQL, _tableName, dropTableSQL, addFieldSQL, modifyFieldSQL, defaultClause, _modifyFieldSQL, dropFieldSQL, _tableName2, field, _defaultClause, _dropFieldSQL, existingColumns, columnNames, missingColumns, indexColumns, primaryKeySQL, uniqueSQL, addIndexSQL, dropPrimaryKeySQL, dropIndexSQL, _tableName3, index, _dropPrimaryKeySQL, _dropIndexSQL, _uniqueSQL, addPrimaryKeySQL, _addIndexSQL, dropCurrentProcSQL, createProcSQL, dropViewSQL, createViewSQL, _dropViewSQL, _createViewSQL, _dropViewSQL2, createTriggerSQL, dropTriggerSQL, _createTriggerSQL, _dropTriggerSQL, _createDatabaseSQL;
+            var diff, createDatabaseSQL, tableName, createSQL, _tableName, dropTableSQL, addFieldSQL, modifyFieldSQL, defaultClause, _modifyFieldSQL, dropFieldSQL, _tableName2, field, isTimestamp, _defaultClause, currentField, hasOnUpdate, _dropFieldSQL, existingColumns, columnNames, missingColumns, indexColumns, primaryKeySQL, uniqueSQL, addIndexSQL, dropPrimaryKeySQL, dropIndexSQL, _tableName3, index, _dropPrimaryKeySQL, _dropIndexSQL, _uniqueSQL, addPrimaryKeySQL, _addIndexSQL, dropCurrentProcSQL, createProcSQL, dropViewSQL, createViewSQL, _dropViewSQL, _createViewSQL, _dropViewSQL2, createTriggerSQL, dropTriggerSQL, _createTriggerSQL, _dropTriggerSQL, _createDatabaseSQL;
             return _regeneratorRuntime().wrap(function _loop$(_context) {
               while (1) switch (_context.prev = _context.next) {
                 case 0:
@@ -3610,7 +3610,7 @@ var applyDifferences = /*#__PURE__*/function () {
                     break;
                   }
                   createDatabaseSQL = "CREATE DATABASE `".concat(differences[0].database, "`;");
-                  logger("Executing: ".concat(createDatabaseSQL));
+                  console.log("Executing: ".concat(createDatabaseSQL));
                   _context.next = 7;
                   return connection.query(createDatabaseSQL);
                 case 7:
@@ -3625,11 +3625,11 @@ var applyDifferences = /*#__PURE__*/function () {
                   }
                   tableName = diff.tableName, createSQL = diff.createSQL;
                   logger("Creating missing table ".concat(tableName));
-                  logger("Executing: ".concat(createSQL));
+                  console.log("Executing: ".concat(createSQL));
                   _context.next = 16;
                   return connection.query(createSQL);
                 case 16:
-                  _context.next = 210;
+                  _context.next = 213;
                   break;
                 case 18:
                   if (!(diff.type === 'extra_table')) {
@@ -3639,11 +3639,11 @@ var applyDifferences = /*#__PURE__*/function () {
                   _tableName = diff.tableName;
                   logger("Dropping extra table ".concat(_tableName));
                   dropTableSQL = "DROP TABLE `".concat(_tableName, "`;");
-                  logger("Executing: ".concat(dropTableSQL));
+                  console.log("Executing: ".concat(dropTableSQL));
                   _context.next = 25;
                   return connection.query(dropTableSQL);
                 case 25:
-                  _context.next = 210;
+                  _context.next = 213;
                   break;
                 case 27:
                   if (!(diff.type === 'missing_field')) {
@@ -3652,7 +3652,7 @@ var applyDifferences = /*#__PURE__*/function () {
                   }
                   // Step 1: Add column with DEFAULT NULL to handle existing records
                   addFieldSQL = "ALTER TABLE `".concat(diff.tableName, "` ADD `").concat(diff.field.Field, "` ").concat(diff.field.Type, " DEFAULT NULL;");
-                  logger("Executing: ".concat(addFieldSQL));
+                  console.log("Executing: ".concat(addFieldSQL));
                   _context.next = 32;
                   return connection.query(addFieldSQL);
                 case 32:
@@ -3661,7 +3661,7 @@ var applyDifferences = /*#__PURE__*/function () {
                     break;
                   }
                   modifyFieldSQL = "ALTER TABLE `".concat(diff.tableName, "` MODIFY `").concat(diff.field.Field, "` ").concat(diff.field.Type, " NOT NULL;");
-                  logger("Executing: ".concat(modifyFieldSQL));
+                  console.log("Executing: ".concat(modifyFieldSQL));
                   _context.next = 37;
                   return connection.query(modifyFieldSQL);
                 case 37:
@@ -3671,11 +3671,11 @@ var applyDifferences = /*#__PURE__*/function () {
                   }
                   defaultClause = diff.field.Default === 'CURRENT_TIMESTAMP' ? 'DEFAULT CURRENT_TIMESTAMP' : diff.field.Default !== undefined && diff.field.Default !== null ? "DEFAULT '".concat(diff.field.Default, "'") : '';
                   _modifyFieldSQL = "ALTER TABLE `".concat(diff.tableName, "` MODIFY `").concat(diff.field.Field, "` ").concat(diff.field.Type, " ").concat(defaultClause, ";");
-                  logger("Executing: ".concat(_modifyFieldSQL));
+                  console.log("Executing: ".concat(_modifyFieldSQL));
                   _context.next = 43;
                   return connection.query(_modifyFieldSQL);
                 case 43:
-                  _context.next = 210;
+                  _context.next = 213;
                   break;
                 case 45:
                   if (!(diff.type === 'extra_field')) {
@@ -3683,34 +3683,37 @@ var applyDifferences = /*#__PURE__*/function () {
                     break;
                   }
                   dropFieldSQL = "ALTER TABLE `".concat(diff.tableName, "` DROP COLUMN `").concat(diff.field.Field, "`;");
-                  logger("Executing: ".concat(dropFieldSQL));
+                  console.log("Executing: ".concat(dropFieldSQL));
                   _context.next = 50;
                   return connection.query(dropFieldSQL);
                 case 50:
-                  _context.next = 210;
+                  _context.next = 213;
                   break;
                 case 52:
                   if (!(diff.type === 'mismatched_field')) {
-                    _context.next = 61;
+                    _context.next = 64;
                     break;
                   }
                   _tableName2 = diff.tableName, field = diff.field;
-                  _defaultClause = field.Default === 'CURRENT_TIMESTAMP' ? 'DEFAULT CURRENT_TIMESTAMP' : field.Default === 'NULL' ? 'DEFAULT NULL' : field.Default !== undefined && field.Default !== null ? "DEFAULT '".concat(field.Default, "'") : 'DEFAULT NULL';
-                  _dropFieldSQL = "ALTER TABLE `".concat(_tableName2, "` CHANGE `").concat(field.Field, "` `").concat(field.Field, "` ").concat(field.Type, " ").concat(field.NotNull ? 'NOT NULL' : '', " ").concat(_defaultClause, ";");
+                  isTimestamp = field.Type.toLowerCase().includes('timestamp'); // Handle timestamp specific attributes
+                  _defaultClause = field.Default === 'CURRENT_TIMESTAMP' ? 'DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP' : field.Default === 'NULL' ? isTimestamp ? 'NULL DEFAULT NULL' : 'DEFAULT NULL' : field.Default !== undefined && field.Default !== null ? "DEFAULT '".concat(field.Default, "'") : isTimestamp ? 'NULL DEFAULT NULL' : 'DEFAULT NULL'; // Remove ON UPDATE CURRENT_TIMESTAMP if we're changing away from CURRENT_TIMESTAMP
+                  currentField = diff.currentField;
+                  hasOnUpdate = (currentField === null || currentField === undefined ? undefined : currentField.Default) === 'CURRENT_TIMESTAMP' && field.Default !== 'CURRENT_TIMESTAMP';
+                  _dropFieldSQL = "ALTER TABLE `".concat(_tableName2, "` CHANGE `").concat(field.Field, "` `").concat(field.Field, "` ").concat(field.Type, " ").concat(field.NotNull ? 'NOT NULL' : '', " ").concat(_defaultClause).concat(hasOnUpdate ? ' ON UPDATE CURRENT_TIMESTAMP' : '', ";");
                   logger("Executing: ".concat(_dropFieldSQL));
-                  _context.next = 59;
+                  _context.next = 62;
                   return connection.query(_dropFieldSQL);
-                case 59:
-                  _context.next = 210;
+                case 62:
+                  _context.next = 213;
                   break;
-                case 61:
+                case 64:
                   if (!(diff.type === 'missing_index')) {
-                    _context.next = 93;
+                    _context.next = 96;
                     break;
                   }
-                  _context.next = 64;
+                  _context.next = 67;
                   return connection.query("SHOW COLUMNS FROM `".concat(diff.tableName, "`"));
-                case 64:
+                case 67:
                   existingColumns = _context.sent;
                   columnNames = existingColumns.map(function (col) {
                     return col.Field;
@@ -3719,260 +3722,260 @@ var applyDifferences = /*#__PURE__*/function () {
                     return !columnNames.includes(col);
                   }) : [];
                   if (!(missingColumns.length > 0)) {
-                    _context.next = 70;
+                    _context.next = 73;
                     break;
                   }
                   logger("Cannot create index ".concat(diff.index.Name, " on ").concat(diff.tableName, ". Missing columns: ").concat(missingColumns.join(', ')));
                   return _context.abrupt("return", 0);
-                case 70:
+                case 73:
                   // Prepare the index columns with proper formatting
                   indexColumns = diff.index.ColumnName.map(function (col) {
                     return "`".concat(col, "`");
                   }); // Format column names
                   // Handle PRIMARY index creation
                   if (!(diff.index.Name === 'PRIMARY')) {
-                    _context.next = 82;
+                    _context.next = 85;
                     break;
                   }
                   if (!(indexColumns.length > 0)) {
-                    _context.next = 79;
+                    _context.next = 82;
                     break;
                   }
                   primaryKeySQL = "ALTER TABLE `".concat(diff.tableName, "` ADD PRIMARY KEY (").concat(indexColumns.join(', '), ");");
-                  logger("Executing: ".concat(primaryKeySQL));
-                  _context.next = 77;
-                  return connection.query(primaryKeySQL);
-                case 77:
+                  console.log("Executing: ".concat(primaryKeySQL));
                   _context.next = 80;
-                  break;
-                case 79:
-                  logger("Cannot create PRIMARY index on ".concat(diff.tableName, ". ColumnName is undefined or empty."), diff.index);
+                  return connection.query(primaryKeySQL);
                 case 80:
-                  _context.next = 91;
+                  _context.next = 83;
                   break;
                 case 82:
+                  logger("Cannot create PRIMARY index on ".concat(diff.tableName, ". ColumnName is undefined or empty."), diff.index);
+                case 83:
+                  _context.next = 94;
+                  break;
+                case 85:
                   // Create the new index with UNIQUE if applicable
                   uniqueSQL = diff.index.Unique ? 'UNIQUE ' : ''; // Check if the index is unique
                   if (!(indexColumns.length > 0)) {
-                    _context.next = 90;
+                    _context.next = 93;
                     break;
                   }
                   addIndexSQL = "ALTER TABLE `".concat(diff.tableName, "` ADD ").concat(uniqueSQL, "INDEX `").concat(diff.index.Name, "` (").concat(indexColumns.join(', '), ");");
-                  logger("Executing: ".concat(addIndexSQL));
-                  _context.next = 88;
-                  return connection.query(addIndexSQL);
-                case 88:
+                  console.log("Executing: ".concat(addIndexSQL));
                   _context.next = 91;
-                  break;
-                case 90:
-                  logger("Cannot create index ".concat(diff.index.Name, " on ").concat(diff.tableName, ". ColumnName is undefined or empty."), diff.index);
+                  return connection.query(addIndexSQL);
                 case 91:
-                  _context.next = 210;
+                  _context.next = 94;
                   break;
                 case 93:
+                  logger("Cannot create index ".concat(diff.index.Name, " on ").concat(diff.tableName, ". ColumnName is undefined or empty."), diff.index);
+                case 94:
+                  _context.next = 213;
+                  break;
+                case 96:
                   if (!(diff.type === 'extra_index')) {
-                    _context.next = 107;
+                    _context.next = 110;
                     break;
                   }
                   if (!(diff.index.Name === 'PRIMARY')) {
-                    _context.next = 101;
+                    _context.next = 104;
                     break;
                   }
                   dropPrimaryKeySQL = "ALTER TABLE `".concat(diff.tableName, "` DROP PRIMARY KEY;");
-                  logger("Executing: ".concat(dropPrimaryKeySQL));
-                  _context.next = 99;
+                  console.log("Executing: ".concat(dropPrimaryKeySQL));
+                  _context.next = 102;
                   return connection.query(dropPrimaryKeySQL);
-                case 99:
-                  _context.next = 105;
+                case 102:
+                  _context.next = 108;
                   break;
-                case 101:
+                case 104:
                   dropIndexSQL = "DROP INDEX `".concat(diff.index.Name, "` ON `").concat(diff.tableName, "`;");
-                  logger("Executing: ".concat(dropIndexSQL));
-                  _context.next = 105;
+                  console.log("Executing: ".concat(dropIndexSQL));
+                  _context.next = 108;
                   return connection.query(dropIndexSQL);
-                case 105:
-                  _context.next = 210;
+                case 108:
+                  _context.next = 213;
                   break;
-                case 107:
+                case 110:
                   if (!(diff.type === 'mismatched_index')) {
-                    _context.next = 135;
+                    _context.next = 138;
                     break;
                   }
                   _tableName3 = diff.tableName, index = diff.index; // Drop the existing index
                   if (!(index.Name === 'PRIMARY')) {
-                    _context.next = 116;
+                    _context.next = 119;
                     break;
                   }
                   _dropPrimaryKeySQL = "ALTER TABLE `".concat(_tableName3, "` DROP PRIMARY KEY;");
-                  logger("Executing: ".concat(_dropPrimaryKeySQL));
-                  _context.next = 114;
+                  console.log("Executing: ".concat(_dropPrimaryKeySQL));
+                  _context.next = 117;
                   return connection.query(_dropPrimaryKeySQL);
-                case 114:
-                  _context.next = 120;
+                case 117:
+                  _context.next = 123;
                   break;
-                case 116:
+                case 119:
                   _dropIndexSQL = "DROP INDEX `".concat(index.Name, "` ON `").concat(_tableName3, "`;");
-                  logger("Executing: ".concat(_dropIndexSQL));
-                  _context.next = 120;
+                  console.log("Executing: ".concat(_dropIndexSQL));
+                  _context.next = 123;
                   return connection.query(_dropIndexSQL);
-                case 120:
+                case 123:
                   console.log('index', index);
                   // Create the new index
                   _uniqueSQL = index.Unique ? 'UNIQUE ' : ''; // Check if the index is unique
                   if (!(index.Name === 'PRIMARY')) {
-                    _context.next = 129;
+                    _context.next = 132;
                     break;
                   }
                   addPrimaryKeySQL = "ALTER TABLE `".concat(_tableName3, "` ADD PRIMARY KEY (").concat(index.ColumnName.join(', '), ");");
-                  logger("Executing: ".concat(addPrimaryKeySQL));
-                  _context.next = 127;
+                  console.log("Executing: ".concat(addPrimaryKeySQL));
+                  _context.next = 130;
                   return connection.query(addPrimaryKeySQL);
-                case 127:
-                  _context.next = 133;
+                case 130:
+                  _context.next = 136;
                   break;
-                case 129:
+                case 132:
                   _addIndexSQL = "ALTER TABLE `".concat(_tableName3, "` ADD ").concat(_uniqueSQL, "INDEX `").concat(index.Name, "` (").concat(index.ColumnName.join(', '), ");"); // Include UNIQUE if applicable
-                  logger("Executing: ".concat(_addIndexSQL));
-                  _context.next = 133;
+                  console.log("Executing: ".concat(_addIndexSQL));
+                  _context.next = 136;
                   return connection.query(_addIndexSQL);
-                case 133:
-                  _context.next = 210;
+                case 136:
+                  _context.next = 213;
                   break;
-                case 135:
+                case 138:
                   if (!(diff.type === 'missing_procedure' || diff.type === 'mismatched_procedure')) {
-                    _context.next = 146;
+                    _context.next = 149;
                     break;
                   }
                   // Drop the procedure if it exists
                   dropCurrentProcSQL = "DROP PROCEDURE IF EXISTS `".concat(diff.Name, "`;");
-                  logger("Executing: ".concat(dropCurrentProcSQL));
-                  _context.next = 140;
+                  console.log("Executing: ".concat(dropCurrentProcSQL));
+                  _context.next = 143;
                   return connection.query(dropCurrentProcSQL);
-                case 140:
+                case 143:
                   // Create the procedure
                   createProcSQL = diff.Definition;
-                  logger("Executing: ".concat(createProcSQL)); // Log the SQL statement
-                  _context.next = 144;
+                  console.log("Executing: ".concat(createProcSQL)); // Log the SQL statement
+                  _context.next = 147;
                   return connection.query(createProcSQL);
-                case 144:
-                  _context.next = 210;
+                case 147:
+                  _context.next = 213;
                   break;
-                case 146:
+                case 149:
                   if (!(diff.type === 'missing_view')) {
-                    _context.next = 157;
+                    _context.next = 160;
                     break;
                   }
                   dropViewSQL = "DROP VIEW IF EXISTS `".concat(diff.viewName, "`;");
-                  logger("Executing: ".concat(dropViewSQL));
-                  _context.next = 151;
+                  console.log("Executing: ".concat(dropViewSQL));
+                  _context.next = 154;
                   return connection.query(dropViewSQL);
-                case 151:
+                case 154:
                   createViewSQL = diff.definition; // Use the expected definition to create the view
-                  logger("Executing: ".concat(createViewSQL));
-                  _context.next = 155;
+                  console.log("Executing: ".concat(createViewSQL));
+                  _context.next = 158;
                   return connection.query(createViewSQL);
-                case 155:
-                  _context.next = 210;
+                case 158:
+                  _context.next = 213;
                   break;
-                case 157:
+                case 160:
                   if (!(diff.type === 'mismatched_view')) {
-                    _context.next = 168;
+                    _context.next = 171;
                     break;
                   }
                   _dropViewSQL = "DROP VIEW IF EXISTS `".concat(diff.viewName, "`;");
-                  logger("Executing: ".concat(_dropViewSQL));
-                  _context.next = 162;
+                  console.log("Executing: ".concat(_dropViewSQL));
+                  _context.next = 165;
                   return connection.query(_dropViewSQL);
-                case 162:
+                case 165:
                   _createViewSQL = diff.definition; // Use the expected definition to create the view
-                  logger("Executing: ".concat(_createViewSQL));
-                  _context.next = 166;
+                  console.log("Executing: ".concat(_createViewSQL));
+                  _context.next = 169;
                   return connection.query(_createViewSQL);
-                case 166:
-                  _context.next = 210;
+                case 169:
+                  _context.next = 213;
                   break;
-                case 168:
+                case 171:
                   if (!(diff.type === 'extra_view')) {
-                    _context.next = 175;
+                    _context.next = 178;
                     break;
                   }
                   _dropViewSQL2 = "DROP VIEW IF EXISTS `".concat(diff.viewName, "`;");
-                  logger("Executing: ".concat(_dropViewSQL2));
-                  _context.next = 173;
+                  console.log("Executing: ".concat(_dropViewSQL2));
+                  _context.next = 176;
                   return connection.query(_dropViewSQL2);
-                case 173:
-                  _context.next = 210;
+                case 176:
+                  _context.next = 213;
                   break;
-                case 175:
+                case 178:
                   if (!(diff.type === 'missing_trigger')) {
-                    _context.next = 183;
+                    _context.next = 186;
                     break;
                   }
                   createTriggerSQL = diff.trigger.Definition;
                   logger('fixing trigger', diff.trigger.Name);
-                  logger("Executing: ".concat(createTriggerSQL));
-                  _context.next = 181;
+                  console.log("Executing: ".concat(createTriggerSQL));
+                  _context.next = 184;
                   return connection.query(createTriggerSQL);
-                case 181:
-                  _context.next = 210;
+                case 184:
+                  _context.next = 213;
                   break;
-                case 183:
+                case 186:
                   if (!(diff.type === 'mismatched_trigger')) {
-                    _context.next = 194;
+                    _context.next = 197;
                     break;
                   }
                   dropTriggerSQL = "DROP TRIGGER IF EXISTS `".concat(diff.trigger.Name, "`;");
-                  logger("Executing: ".concat(dropTriggerSQL));
-                  _context.next = 188;
+                  console.log("Executing: ".concat(dropTriggerSQL));
+                  _context.next = 191;
                   return connection.query(dropTriggerSQL);
-                case 188:
+                case 191:
                   _createTriggerSQL = diff.trigger.Definition;
-                  logger("Executing: ".concat(_createTriggerSQL));
-                  _context.next = 192;
+                  console.log("Executing: ".concat(_createTriggerSQL));
+                  _context.next = 195;
                   return connection.query(_createTriggerSQL);
-                case 192:
-                  _context.next = 210;
+                case 195:
+                  _context.next = 213;
                   break;
-                case 194:
+                case 197:
                   if (!(diff.type === 'extra_trigger')) {
-                    _context.next = 201;
+                    _context.next = 204;
                     break;
                   }
                   _dropTriggerSQL = "DROP TRIGGER IF EXISTS `".concat(diff.trigger.Name, "`;");
-                  logger("Executing: ".concat(_dropTriggerSQL));
-                  _context.next = 199;
+                  console.log("Executing: ".concat(_dropTriggerSQL));
+                  _context.next = 202;
                   return connection.query(_dropTriggerSQL);
-                case 199:
-                  _context.next = 210;
+                case 202:
+                  _context.next = 213;
                   break;
-                case 201:
+                case 204:
                   if (!(diff.type === 'missing_database')) {
-                    _context.next = 209;
+                    _context.next = 212;
                     break;
                   }
                   logger('fixing missing database', diff.database);
                   _createDatabaseSQL = "CREATE DATABASE `".concat(diff.database, "`;");
-                  logger("Executing: ".concat(_createDatabaseSQL));
-                  _context.next = 207;
-                  return connection.query(_createDatabaseSQL);
-                case 207:
+                  console.log("Executing: ".concat(_createDatabaseSQL));
                   _context.next = 210;
-                  break;
-                case 209:
-                  logger("Error applying difference of type:".concat(diff.type), diff);
+                  return connection.query(_createDatabaseSQL);
                 case 210:
-                  _context.next = 215;
+                  _context.next = 213;
                   break;
                 case 212:
-                  _context.prev = 212;
+                  logger("Error applying difference of type:".concat(diff.type), diff);
+                case 213:
+                  _context.next = 218;
+                  break;
+                case 215:
+                  _context.prev = 215;
                   _context.t0 = _context["catch"](1);
                   logger("Error applying difference of type:".concat(diff.type, ". Error: ").concat(_context.t0.message), diff);
-                case 215:
+                case 218:
                 case "end":
                   return _context.stop();
               }
-            }, _loop, null, [[1, 212]]);
+            }, _loop, null, [[1, 215]]);
           });
           _iterator.s();
         case 5:

package/dist/index.js CHANGED Viewed

@@ -3596,7 +3596,7 @@ var applyDifferences = /*#__PURE__*/function () {
           _iterator = _createForOfIteratorHelper(differences);
           _context2.prev = 2;
           _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop() {
-            var diff, createDatabaseSQL, tableName, createSQL, _tableName, dropTableSQL, addFieldSQL, modifyFieldSQL, defaultClause, _modifyFieldSQL, dropFieldSQL, _tableName2, field, _defaultClause, _dropFieldSQL, existingColumns, columnNames, missingColumns, indexColumns, primaryKeySQL, uniqueSQL, addIndexSQL, dropPrimaryKeySQL, dropIndexSQL, _tableName3, index, _dropPrimaryKeySQL, _dropIndexSQL, _uniqueSQL, addPrimaryKeySQL, _addIndexSQL, dropCurrentProcSQL, createProcSQL, dropViewSQL, createViewSQL, _dropViewSQL, _createViewSQL, _dropViewSQL2, createTriggerSQL, dropTriggerSQL, _createTriggerSQL, _dropTriggerSQL, _createDatabaseSQL;
+            var diff, createDatabaseSQL, tableName, createSQL, _tableName, dropTableSQL, addFieldSQL, modifyFieldSQL, defaultClause, _modifyFieldSQL, dropFieldSQL, _tableName2, field, isTimestamp, _defaultClause, currentField, hasOnUpdate, _dropFieldSQL, existingColumns, columnNames, missingColumns, indexColumns, primaryKeySQL, uniqueSQL, addIndexSQL, dropPrimaryKeySQL, dropIndexSQL, _tableName3, index, _dropPrimaryKeySQL, _dropIndexSQL, _uniqueSQL, addPrimaryKeySQL, _addIndexSQL, dropCurrentProcSQL, createProcSQL, dropViewSQL, createViewSQL, _dropViewSQL, _createViewSQL, _dropViewSQL2, createTriggerSQL, dropTriggerSQL, _createTriggerSQL, _dropTriggerSQL, _createDatabaseSQL;
             return _regeneratorRuntime().wrap(function _loop$(_context) {
               while (1) switch (_context.prev = _context.next) {
                 case 0:
@@ -3607,7 +3607,7 @@ var applyDifferences = /*#__PURE__*/function () {
                     break;
                   }
                   createDatabaseSQL = "CREATE DATABASE `".concat(differences[0].database, "`;");
-                  logger("Executing: ".concat(createDatabaseSQL));
+                  console.log("Executing: ".concat(createDatabaseSQL));
                   _context.next = 7;
                   return connection.query(createDatabaseSQL);
                 case 7:
@@ -3622,11 +3622,11 @@ var applyDifferences = /*#__PURE__*/function () {
                   }
                   tableName = diff.tableName, createSQL = diff.createSQL;
                   logger("Creating missing table ".concat(tableName));
-                  logger("Executing: ".concat(createSQL));
+                  console.log("Executing: ".concat(createSQL));
                   _context.next = 16;
                   return connection.query(createSQL);
                 case 16:
-                  _context.next = 210;
+                  _context.next = 213;
                   break;
                 case 18:
                   if (!(diff.type === 'extra_table')) {
@@ -3636,11 +3636,11 @@ var applyDifferences = /*#__PURE__*/function () {
                   _tableName = diff.tableName;
                   logger("Dropping extra table ".concat(_tableName));
                   dropTableSQL = "DROP TABLE `".concat(_tableName, "`;");
-                  logger("Executing: ".concat(dropTableSQL));
+                  console.log("Executing: ".concat(dropTableSQL));
                   _context.next = 25;
                   return connection.query(dropTableSQL);
                 case 25:
-                  _context.next = 210;
+                  _context.next = 213;
                   break;
                 case 27:
                   if (!(diff.type === 'missing_field')) {
@@ -3649,7 +3649,7 @@ var applyDifferences = /*#__PURE__*/function () {
                   }
                   // Step 1: Add column with DEFAULT NULL to handle existing records
                   addFieldSQL = "ALTER TABLE `".concat(diff.tableName, "` ADD `").concat(diff.field.Field, "` ").concat(diff.field.Type, " DEFAULT NULL;");
-                  logger("Executing: ".concat(addFieldSQL));
+                  console.log("Executing: ".concat(addFieldSQL));
                   _context.next = 32;
                   return connection.query(addFieldSQL);
                 case 32:
@@ -3658,7 +3658,7 @@ var applyDifferences = /*#__PURE__*/function () {
                     break;
                   }
                   modifyFieldSQL = "ALTER TABLE `".concat(diff.tableName, "` MODIFY `").concat(diff.field.Field, "` ").concat(diff.field.Type, " NOT NULL;");
-                  logger("Executing: ".concat(modifyFieldSQL));
+                  console.log("Executing: ".concat(modifyFieldSQL));
                   _context.next = 37;
                   return connection.query(modifyFieldSQL);
                 case 37:
@@ -3668,11 +3668,11 @@ var applyDifferences = /*#__PURE__*/function () {
                   }
                   defaultClause = diff.field.Default === 'CURRENT_TIMESTAMP' ? 'DEFAULT CURRENT_TIMESTAMP' : diff.field.Default !== undefined && diff.field.Default !== null ? "DEFAULT '".concat(diff.field.Default, "'") : '';
                   _modifyFieldSQL = "ALTER TABLE `".concat(diff.tableName, "` MODIFY `").concat(diff.field.Field, "` ").concat(diff.field.Type, " ").concat(defaultClause, ";");
-                  logger("Executing: ".concat(_modifyFieldSQL));
+                  console.log("Executing: ".concat(_modifyFieldSQL));
                   _context.next = 43;
                   return connection.query(_modifyFieldSQL);
                 case 43:
-                  _context.next = 210;
+                  _context.next = 213;
                   break;
                 case 45:
                   if (!(diff.type === 'extra_field')) {
@@ -3680,34 +3680,37 @@ var applyDifferences = /*#__PURE__*/function () {
                     break;
                   }
                   dropFieldSQL = "ALTER TABLE `".concat(diff.tableName, "` DROP COLUMN `").concat(diff.field.Field, "`;");
-                  logger("Executing: ".concat(dropFieldSQL));
+                  console.log("Executing: ".concat(dropFieldSQL));
                   _context.next = 50;
                   return connection.query(dropFieldSQL);
                 case 50:
-                  _context.next = 210;
+                  _context.next = 213;
                   break;
                 case 52:
                   if (!(diff.type === 'mismatched_field')) {
-                    _context.next = 61;
+                    _context.next = 64;
                     break;
                   }
                   _tableName2 = diff.tableName, field = diff.field;
-                  _defaultClause = field.Default === 'CURRENT_TIMESTAMP' ? 'DEFAULT CURRENT_TIMESTAMP' : field.Default === 'NULL' ? 'DEFAULT NULL' : field.Default !== undefined && field.Default !== null ? "DEFAULT '".concat(field.Default, "'") : 'DEFAULT NULL';
-                  _dropFieldSQL = "ALTER TABLE `".concat(_tableName2, "` CHANGE `").concat(field.Field, "` `").concat(field.Field, "` ").concat(field.Type, " ").concat(field.NotNull ? 'NOT NULL' : '', " ").concat(_defaultClause, ";");
+                  isTimestamp = field.Type.toLowerCase().includes('timestamp'); // Handle timestamp specific attributes
+                  _defaultClause = field.Default === 'CURRENT_TIMESTAMP' ? 'DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP' : field.Default === 'NULL' ? isTimestamp ? 'NULL DEFAULT NULL' : 'DEFAULT NULL' : field.Default !== undefined && field.Default !== null ? "DEFAULT '".concat(field.Default, "'") : isTimestamp ? 'NULL DEFAULT NULL' : 'DEFAULT NULL'; // Remove ON UPDATE CURRENT_TIMESTAMP if we're changing away from CURRENT_TIMESTAMP
+                  currentField = diff.currentField;
+                  hasOnUpdate = (currentField === null || currentField === undefined ? undefined : currentField.Default) === 'CURRENT_TIMESTAMP' && field.Default !== 'CURRENT_TIMESTAMP';
+                  _dropFieldSQL = "ALTER TABLE `".concat(_tableName2, "` CHANGE `").concat(field.Field, "` `").concat(field.Field, "` ").concat(field.Type, " ").concat(field.NotNull ? 'NOT NULL' : '', " ").concat(_defaultClause).concat(hasOnUpdate ? ' ON UPDATE CURRENT_TIMESTAMP' : '', ";");
                   logger("Executing: ".concat(_dropFieldSQL));
-                  _context.next = 59;
+                  _context.next = 62;
                   return connection.query(_dropFieldSQL);
-                case 59:
-                  _context.next = 210;
+                case 62:
+                  _context.next = 213;
                   break;
-                case 61:
+                case 64:
                   if (!(diff.type === 'missing_index')) {
-                    _context.next = 93;
+                    _context.next = 96;
                     break;
                   }
-                  _context.next = 64;
+                  _context.next = 67;
                   return connection.query("SHOW COLUMNS FROM `".concat(diff.tableName, "`"));
-                case 64:
+                case 67:
                   existingColumns = _context.sent;
                   columnNames = existingColumns.map(function (col) {
                     return col.Field;
@@ -3716,260 +3719,260 @@ var applyDifferences = /*#__PURE__*/function () {
                     return !columnNames.includes(col);
                   }) : [];
                   if (!(missingColumns.length > 0)) {
-                    _context.next = 70;
+                    _context.next = 73;
                     break;
                   }
                   logger("Cannot create index ".concat(diff.index.Name, " on ").concat(diff.tableName, ". Missing columns: ").concat(missingColumns.join(', ')));
                   return _context.abrupt("return", 0);
-                case 70:
+                case 73:
                   // Prepare the index columns with proper formatting
                   indexColumns = diff.index.ColumnName.map(function (col) {
                     return "`".concat(col, "`");
                   }); // Format column names
                   // Handle PRIMARY index creation
                   if (!(diff.index.Name === 'PRIMARY')) {
-                    _context.next = 82;
+                    _context.next = 85;
                     break;
                   }
                   if (!(indexColumns.length > 0)) {
-                    _context.next = 79;
+                    _context.next = 82;
                     break;
                   }
                   primaryKeySQL = "ALTER TABLE `".concat(diff.tableName, "` ADD PRIMARY KEY (").concat(indexColumns.join(', '), ");");
-                  logger("Executing: ".concat(primaryKeySQL));
-                  _context.next = 77;
-                  return connection.query(primaryKeySQL);
-                case 77:
+                  console.log("Executing: ".concat(primaryKeySQL));
                   _context.next = 80;
-                  break;
-                case 79:
-                  logger("Cannot create PRIMARY index on ".concat(diff.tableName, ". ColumnName is undefined or empty."), diff.index);
+                  return connection.query(primaryKeySQL);
                 case 80:
-                  _context.next = 91;
+                  _context.next = 83;
                   break;
                 case 82:
+                  logger("Cannot create PRIMARY index on ".concat(diff.tableName, ". ColumnName is undefined or empty."), diff.index);
+                case 83:
+                  _context.next = 94;
+                  break;
+                case 85:
                   // Create the new index with UNIQUE if applicable
                   uniqueSQL = diff.index.Unique ? 'UNIQUE ' : ''; // Check if the index is unique
                   if (!(indexColumns.length > 0)) {
-                    _context.next = 90;
+                    _context.next = 93;
                     break;
                   }
                   addIndexSQL = "ALTER TABLE `".concat(diff.tableName, "` ADD ").concat(uniqueSQL, "INDEX `").concat(diff.index.Name, "` (").concat(indexColumns.join(', '), ");");
-                  logger("Executing: ".concat(addIndexSQL));
-                  _context.next = 88;
-                  return connection.query(addIndexSQL);
-                case 88:
+                  console.log("Executing: ".concat(addIndexSQL));
                   _context.next = 91;
-                  break;
-                case 90:
-                  logger("Cannot create index ".concat(diff.index.Name, " on ").concat(diff.tableName, ". ColumnName is undefined or empty."), diff.index);
+                  return connection.query(addIndexSQL);
                 case 91:
-                  _context.next = 210;
+                  _context.next = 94;
                   break;
                 case 93:
+                  logger("Cannot create index ".concat(diff.index.Name, " on ").concat(diff.tableName, ". ColumnName is undefined or empty."), diff.index);
+                case 94:
+                  _context.next = 213;
+                  break;
+                case 96:
                   if (!(diff.type === 'extra_index')) {
-                    _context.next = 107;
+                    _context.next = 110;
                     break;
                   }
                   if (!(diff.index.Name === 'PRIMARY')) {
-                    _context.next = 101;
+                    _context.next = 104;
                     break;
                   }
                   dropPrimaryKeySQL = "ALTER TABLE `".concat(diff.tableName, "` DROP PRIMARY KEY;");
-                  logger("Executing: ".concat(dropPrimaryKeySQL));
-                  _context.next = 99;
+                  console.log("Executing: ".concat(dropPrimaryKeySQL));
+                  _context.next = 102;
                   return connection.query(dropPrimaryKeySQL);
-                case 99:
-                  _context.next = 105;
+                case 102:
+                  _context.next = 108;
                   break;
-                case 101:
+                case 104:
                   dropIndexSQL = "DROP INDEX `".concat(diff.index.Name, "` ON `").concat(diff.tableName, "`;");
-                  logger("Executing: ".concat(dropIndexSQL));
-                  _context.next = 105;
+                  console.log("Executing: ".concat(dropIndexSQL));
+                  _context.next = 108;
                   return connection.query(dropIndexSQL);
-                case 105:
-                  _context.next = 210;
+                case 108:
+                  _context.next = 213;
                   break;
-                case 107:
+                case 110:
                   if (!(diff.type === 'mismatched_index')) {
-                    _context.next = 135;
+                    _context.next = 138;
                     break;
                   }
                   _tableName3 = diff.tableName, index = diff.index; // Drop the existing index
                   if (!(index.Name === 'PRIMARY')) {
-                    _context.next = 116;
+                    _context.next = 119;
                     break;
                   }
                   _dropPrimaryKeySQL = "ALTER TABLE `".concat(_tableName3, "` DROP PRIMARY KEY;");
-                  logger("Executing: ".concat(_dropPrimaryKeySQL));
-                  _context.next = 114;
+                  console.log("Executing: ".concat(_dropPrimaryKeySQL));
+                  _context.next = 117;
                   return connection.query(_dropPrimaryKeySQL);
-                case 114:
-                  _context.next = 120;
+                case 117:
+                  _context.next = 123;
                   break;
-                case 116:
+                case 119:
                   _dropIndexSQL = "DROP INDEX `".concat(index.Name, "` ON `").concat(_tableName3, "`;");
-                  logger("Executing: ".concat(_dropIndexSQL));
-                  _context.next = 120;
+                  console.log("Executing: ".concat(_dropIndexSQL));
+                  _context.next = 123;
                   return connection.query(_dropIndexSQL);
-                case 120:
+                case 123:
                   console.log('index', index);
                   // Create the new index
                   _uniqueSQL = index.Unique ? 'UNIQUE ' : ''; // Check if the index is unique
                   if (!(index.Name === 'PRIMARY')) {
-                    _context.next = 129;
+                    _context.next = 132;
                     break;
                   }
                   addPrimaryKeySQL = "ALTER TABLE `".concat(_tableName3, "` ADD PRIMARY KEY (").concat(index.ColumnName.join(', '), ");");
-                  logger("Executing: ".concat(addPrimaryKeySQL));
-                  _context.next = 127;
+                  console.log("Executing: ".concat(addPrimaryKeySQL));
+                  _context.next = 130;
                   return connection.query(addPrimaryKeySQL);
-                case 127:
-                  _context.next = 133;
+                case 130:
+                  _context.next = 136;
                   break;
-                case 129:
+                case 132:
                   _addIndexSQL = "ALTER TABLE `".concat(_tableName3, "` ADD ").concat(_uniqueSQL, "INDEX `").concat(index.Name, "` (").concat(index.ColumnName.join(', '), ");"); // Include UNIQUE if applicable
-                  logger("Executing: ".concat(_addIndexSQL));
-                  _context.next = 133;
+                  console.log("Executing: ".concat(_addIndexSQL));
+                  _context.next = 136;
                   return connection.query(_addIndexSQL);
-                case 133:
-                  _context.next = 210;
+                case 136:
+                  _context.next = 213;
                   break;
-                case 135:
+                case 138:
                   if (!(diff.type === 'missing_procedure' || diff.type === 'mismatched_procedure')) {
-                    _context.next = 146;
+                    _context.next = 149;
                     break;
                   }
                   // Drop the procedure if it exists
                   dropCurrentProcSQL = "DROP PROCEDURE IF EXISTS `".concat(diff.Name, "`;");
-                  logger("Executing: ".concat(dropCurrentProcSQL));
-                  _context.next = 140;
+                  console.log("Executing: ".concat(dropCurrentProcSQL));
+                  _context.next = 143;
                   return connection.query(dropCurrentProcSQL);
-                case 140:
+                case 143:
                   // Create the procedure
                   createProcSQL = diff.Definition;
-                  logger("Executing: ".concat(createProcSQL)); // Log the SQL statement
-                  _context.next = 144;
+                  console.log("Executing: ".concat(createProcSQL)); // Log the SQL statement
+                  _context.next = 147;
                   return connection.query(createProcSQL);
-                case 144:
-                  _context.next = 210;
+                case 147:
+                  _context.next = 213;
                   break;
-                case 146:
+                case 149:
                   if (!(diff.type === 'missing_view')) {
-                    _context.next = 157;
+                    _context.next = 160;
                     break;
                   }
                   dropViewSQL = "DROP VIEW IF EXISTS `".concat(diff.viewName, "`;");
-                  logger("Executing: ".concat(dropViewSQL));
-                  _context.next = 151;
+                  console.log("Executing: ".concat(dropViewSQL));
+                  _context.next = 154;
                   return connection.query(dropViewSQL);
-                case 151:
+                case 154:
                   createViewSQL = diff.definition; // Use the expected definition to create the view
-                  logger("Executing: ".concat(createViewSQL));
-                  _context.next = 155;
+                  console.log("Executing: ".concat(createViewSQL));
+                  _context.next = 158;
                   return connection.query(createViewSQL);
-                case 155:
-                  _context.next = 210;
+                case 158:
+                  _context.next = 213;
                   break;
-                case 157:
+                case 160:
                   if (!(diff.type === 'mismatched_view')) {
-                    _context.next = 168;
+                    _context.next = 171;
                     break;
                   }
                   _dropViewSQL = "DROP VIEW IF EXISTS `".concat(diff.viewName, "`;");
-                  logger("Executing: ".concat(_dropViewSQL));
-                  _context.next = 162;
+                  console.log("Executing: ".concat(_dropViewSQL));
+                  _context.next = 165;
                   return connection.query(_dropViewSQL);
-                case 162:
+                case 165:
                   _createViewSQL = diff.definition; // Use the expected definition to create the view
-                  logger("Executing: ".concat(_createViewSQL));
-                  _context.next = 166;
+                  console.log("Executing: ".concat(_createViewSQL));
+                  _context.next = 169;
                   return connection.query(_createViewSQL);
-                case 166:
-                  _context.next = 210;
+                case 169:
+                  _context.next = 213;
                   break;
-                case 168:
+                case 171:
                   if (!(diff.type === 'extra_view')) {
-                    _context.next = 175;
+                    _context.next = 178;
                     break;
                   }
                   _dropViewSQL2 = "DROP VIEW IF EXISTS `".concat(diff.viewName, "`;");
-                  logger("Executing: ".concat(_dropViewSQL2));
-                  _context.next = 173;
+                  console.log("Executing: ".concat(_dropViewSQL2));
+                  _context.next = 176;
                   return connection.query(_dropViewSQL2);
-                case 173:
-                  _context.next = 210;
+                case 176:
+                  _context.next = 213;
                   break;
-                case 175:
+                case 178:
                   if (!(diff.type === 'missing_trigger')) {
-                    _context.next = 183;
+                    _context.next = 186;
                     break;
                   }
                   createTriggerSQL = diff.trigger.Definition;
                   logger('fixing trigger', diff.trigger.Name);
-                  logger("Executing: ".concat(createTriggerSQL));
-                  _context.next = 181;
+                  console.log("Executing: ".concat(createTriggerSQL));
+                  _context.next = 184;
                   return connection.query(createTriggerSQL);
-                case 181:
-                  _context.next = 210;
+                case 184:
+                  _context.next = 213;
                   break;
-                case 183:
+                case 186:
                   if (!(diff.type === 'mismatched_trigger')) {
-                    _context.next = 194;
+                    _context.next = 197;
                     break;
                   }
                   dropTriggerSQL = "DROP TRIGGER IF EXISTS `".concat(diff.trigger.Name, "`;");
-                  logger("Executing: ".concat(dropTriggerSQL));
-                  _context.next = 188;
+                  console.log("Executing: ".concat(dropTriggerSQL));
+                  _context.next = 191;
                   return connection.query(dropTriggerSQL);
-                case 188:
+                case 191:
                   _createTriggerSQL = diff.trigger.Definition;
-                  logger("Executing: ".concat(_createTriggerSQL));
-                  _context.next = 192;
+                  console.log("Executing: ".concat(_createTriggerSQL));
+                  _context.next = 195;
                   return connection.query(_createTriggerSQL);
-                case 192:
-                  _context.next = 210;
+                case 195:
+                  _context.next = 213;
                   break;
-                case 194:
+                case 197:
                   if (!(diff.type === 'extra_trigger')) {
-                    _context.next = 201;
+                    _context.next = 204;
                     break;
                   }
                   _dropTriggerSQL = "DROP TRIGGER IF EXISTS `".concat(diff.trigger.Name, "`;");
-                  logger("Executing: ".concat(_dropTriggerSQL));
-                  _context.next = 199;
+                  console.log("Executing: ".concat(_dropTriggerSQL));
+                  _context.next = 202;
                   return connection.query(_dropTriggerSQL);
-                case 199:
-                  _context.next = 210;
+                case 202:
+                  _context.next = 213;
                   break;
-                case 201:
+                case 204:
                   if (!(diff.type === 'missing_database')) {
-                    _context.next = 209;
+                    _context.next = 212;
                     break;
                   }
                   logger('fixing missing database', diff.database);
                   _createDatabaseSQL = "CREATE DATABASE `".concat(diff.database, "`;");
-                  logger("Executing: ".concat(_createDatabaseSQL));
-                  _context.next = 207;
-                  return connection.query(_createDatabaseSQL);
-                case 207:
+                  console.log("Executing: ".concat(_createDatabaseSQL));
                   _context.next = 210;
-                  break;
-                case 209:
-                  logger("Error applying difference of type:".concat(diff.type), diff);
+                  return connection.query(_createDatabaseSQL);
                 case 210:
-                  _context.next = 215;
+                  _context.next = 213;
                   break;
                 case 212:
-                  _context.prev = 212;
+                  logger("Error applying difference of type:".concat(diff.type), diff);
+                case 213:
+                  _context.next = 218;
+                  break;
+                case 215:
+                  _context.prev = 215;
                   _context.t0 = _context["catch"](1);
                   logger("Error applying difference of type:".concat(diff.type, ". Error: ").concat(_context.t0.message), diff);
-                case 215:
+                case 218:
                 case "end":
                   return _context.stop();
               }
-            }, _loop, null, [[1, 212]]);
+            }, _loop, null, [[1, 215]]);
           });
           _iterator.s();
         case 5:

package/package.json CHANGED Viewed

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

package/src/apply.js CHANGED Viewed

@@ -33,7 +33,7 @@ export const applyDifferences = async (connection, database, differences) => {
             if(diff.type == 'missing_database'){
                 const createDatabaseSQL = `CREATE DATABASE \`${differences[0].database}\`;`;
-                logger(`Executing: ${createDatabaseSQL}`);
+                console.log(`Executing: ${createDatabaseSQL}`);
                 await connection.query(createDatabaseSQL);
                 continue;
             }
@@ -43,26 +43,26 @@ export const applyDifferences = async (connection, database, differences) => {
             if (diff.type === 'missing_table') {
                 const { tableName, createSQL } = diff;
                 logger(`Creating missing table ${tableName}`);
-                logger(`Executing: ${createSQL}`);
+                console.log(`Executing: ${createSQL}`);
                 await connection.query(createSQL);
             } else if (diff.type === 'extra_table') {
                 const { tableName } = diff;
                 logger(`Dropping extra table ${tableName}`);
                 const dropTableSQL = `DROP TABLE \`${tableName}\`;`;
-                logger(`Executing: ${dropTableSQL}`);
+                console.log(`Executing: ${dropTableSQL}`);
                 await connection.query(dropTableSQL);
             } else if (diff.type === 'missing_field') {
                 // Step 1: Add column with DEFAULT NULL to handle existing records
                 const addFieldSQL = `ALTER TABLE \`${diff.tableName}\` ADD \`${diff.field.Field}\` ${diff.field.Type} DEFAULT NULL;`;
-                logger(`Executing: ${addFieldSQL}`);
+                console.log(`Executing: ${addFieldSQL}`);
                 await connection.query(addFieldSQL);
                 // Step 2: If NOT NULL is required and no default was specified, modify the column to remove DEFAULT NULL
                 if (diff.field.NotNull && !diff.field.Default) {
                     const modifyFieldSQL = `ALTER TABLE \`${diff.tableName}\` MODIFY \`${diff.field.Field}\` ${diff.field.Type} NOT NULL;`;
-                    logger(`Executing: ${modifyFieldSQL}`);
+                    console.log(`Executing: ${modifyFieldSQL}`);
                     await connection.query(modifyFieldSQL);
                 }
                 if(diff.field.Default){
@@ -72,26 +72,34 @@ export const applyDifferences = async (connection, database, differences) => {
                         ? `DEFAULT '${diff.field.Default}'`
                         : '';
                     const modifyFieldSQL = `ALTER TABLE \`${diff.tableName}\` MODIFY \`${diff.field.Field}\` ${diff.field.Type} ${defaultClause};`;
-                    logger(`Executing: ${modifyFieldSQL}`);
+                    console.log(`Executing: ${modifyFieldSQL}`);
                     await connection.query(modifyFieldSQL);
                 }
             } else if (diff.type === 'extra_field') {
                 const dropFieldSQL = `ALTER TABLE \`${diff.tableName}\` DROP COLUMN \`${diff.field.Field}\`;`;
-                logger(`Executing: ${dropFieldSQL}`);
+                console.log(`Executing: ${dropFieldSQL}`);
                 await connection.query(dropFieldSQL);
             } else if (diff.type === 'mismatched_field') {
                 const { tableName, field } = diff;
+                const isTimestamp = field.Type.toLowerCase().includes('timestamp');
+                // Handle timestamp specific attributes
                 const defaultClause = field.Default === 'CURRENT_TIMESTAMP'
-                    ? 'DEFAULT CURRENT_TIMESTAMP'
+                    ? 'DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP'
                     : field.Default === 'NULL'
-                        ? 'DEFAULT NULL'
+                        ? isTimestamp ? 'NULL DEFAULT NULL' : 'DEFAULT NULL'
                         : field.Default !== undefined && field.Default !== null
                             ? `DEFAULT '${field.Default}'`
-                            : 'DEFAULT NULL';
+                            : isTimestamp ? 'NULL DEFAULT NULL' : 'DEFAULT NULL';
+                // Remove ON UPDATE CURRENT_TIMESTAMP if we're changing away from CURRENT_TIMESTAMP
+                const currentField = diff.currentField;
+                const hasOnUpdate = currentField?.Default === 'CURRENT_TIMESTAMP' &&
+                    field.Default !== 'CURRENT_TIMESTAMP';
-                const dropFieldSQL = `ALTER TABLE \`${tableName}\` CHANGE \`${field.Field}\` \`${field.Field}\` ${field.Type} ${field.NotNull ? 'NOT NULL' : ''} ${defaultClause};`;
+                const dropFieldSQL = `ALTER TABLE \`${tableName}\` CHANGE \`${field.Field}\` \`${field.Field}\` ${field.Type} ${field.NotNull ? 'NOT NULL' : ''} ${defaultClause}${hasOnUpdate ? ' ON UPDATE CURRENT_TIMESTAMP' : ''};`;
                 logger(`Executing: ${dropFieldSQL}`);
                 await connection.query(dropFieldSQL);
@@ -114,7 +122,7 @@ export const applyDifferences = async (connection, database, differences) => {
                 if (diff.index.Name === 'PRIMARY') {
                     if (indexColumns.length > 0) {
                         const primaryKeySQL = `ALTER TABLE \`${diff.tableName}\` ADD PRIMARY KEY (${indexColumns.join(', ')});`;
-                        logger(`Executing: ${primaryKeySQL}`);
+                        console.log(`Executing: ${primaryKeySQL}`);
                         await connection.query(primaryKeySQL);
                     } else {
                         logger(`Cannot create PRIMARY index on ${diff.tableName}. ColumnName is undefined or empty.`, diff.index);
@@ -124,7 +132,7 @@ export const applyDifferences = async (connection, database, differences) => {
                     const uniqueSQL = diff.index.Unique ? 'UNIQUE ' : ''; // Check if the index is unique
                     if (indexColumns.length > 0) {
                         const addIndexSQL = `ALTER TABLE \`${diff.tableName}\` ADD ${uniqueSQL}INDEX \`${diff.index.Name}\` (${indexColumns.join(', ')});`;
-                        logger(`Executing: ${addIndexSQL}`);
+                        console.log(`Executing: ${addIndexSQL}`);
                         await connection.query(addIndexSQL);
                     } else {
                         logger(`Cannot create index ${diff.index.Name} on ${diff.tableName}. ColumnName is undefined or empty.`, diff.index);
@@ -135,11 +143,11 @@ export const applyDifferences = async (connection, database, differences) => {
                 // Handle dropping of extra indexes
                 if (diff.index.Name === 'PRIMARY') {
                     const dropPrimaryKeySQL = `ALTER TABLE \`${diff.tableName}\` DROP PRIMARY KEY;`;
-                    logger(`Executing: ${dropPrimaryKeySQL}`);
+                    console.log(`Executing: ${dropPrimaryKeySQL}`);
                     await connection.query(dropPrimaryKeySQL);
                 } else {
                     const dropIndexSQL = `DROP INDEX \`${diff.index.Name}\` ON \`${diff.tableName}\`;`;
-                    logger(`Executing: ${dropIndexSQL}`);
+                    console.log(`Executing: ${dropIndexSQL}`);
                     await connection.query(dropIndexSQL);
                 }
@@ -148,11 +156,11 @@ export const applyDifferences = async (connection, database, differences) => {
                 // Drop the existing index
                 if (index.Name === 'PRIMARY') {
                     const dropPrimaryKeySQL = `ALTER TABLE \`${tableName}\` DROP PRIMARY KEY;`;
-                    logger(`Executing: ${dropPrimaryKeySQL}`);
+                    console.log(`Executing: ${dropPrimaryKeySQL}`);
                     await connection.query(dropPrimaryKeySQL);
                 } else {
                     const dropIndexSQL = `DROP INDEX \`${index.Name}\` ON \`${tableName}\`;`;
-                    logger(`Executing: ${dropIndexSQL}`);
+                    console.log(`Executing: ${dropIndexSQL}`);
                     await connection.query(dropIndexSQL);
                 }
                 console.log('index', index)
@@ -161,11 +169,11 @@ export const applyDifferences = async (connection, database, differences) => {
                 const uniqueSQL = index.Unique ? 'UNIQUE ' : ''; // Check if the index is unique
                 if (index.Name === 'PRIMARY') {
                     const addPrimaryKeySQL = `ALTER TABLE \`${tableName}\` ADD PRIMARY KEY (${index.ColumnName.join(', ')});`;
-                    logger(`Executing: ${addPrimaryKeySQL}`);
+                    console.log(`Executing: ${addPrimaryKeySQL}`);
                     await connection.query(addPrimaryKeySQL);
                 } else {
                     const addIndexSQL = `ALTER TABLE \`${tableName}\` ADD ${uniqueSQL}INDEX \`${index.Name}\` (${index.ColumnName.join(', ')});`; // Include UNIQUE if applicable
-                    logger(`Executing: ${addIndexSQL}`);
+                    console.log(`Executing: ${addIndexSQL}`);
                     await connection.query(addIndexSQL);
                 }
@@ -173,65 +181,65 @@ export const applyDifferences = async (connection, database, differences) => {
                 // Drop the procedure if it exists
                 const dropCurrentProcSQL = `DROP PROCEDURE IF EXISTS \`${diff.Name}\`;`;
-                logger(`Executing: ${dropCurrentProcSQL}`);
+                console.log(`Executing: ${dropCurrentProcSQL}`);
                 await connection.query(dropCurrentProcSQL);
                 // Create the procedure
                 const createProcSQL = diff.Definition;
-                logger(`Executing: ${createProcSQL}`); // Log the SQL statement
+                console.log(`Executing: ${createProcSQL}`); // Log the SQL statement
                 await connection.query(createProcSQL);
             } else if (diff.type === 'missing_view') {
                 const dropViewSQL = `DROP VIEW IF EXISTS \`${diff.viewName}\`;`;
-                logger(`Executing: ${dropViewSQL}`);
+                console.log(`Executing: ${dropViewSQL}`);
                 await connection.query(dropViewSQL);
                 const createViewSQL = diff.definition; // Use the expected definition to create the view
-                logger(`Executing: ${createViewSQL}`);
+                console.log(`Executing: ${createViewSQL}`);
                 await connection.query(createViewSQL);
             } else if (diff.type === 'mismatched_view') {
                 const dropViewSQL = `DROP VIEW IF EXISTS \`${diff.viewName}\`;`;
-                logger(`Executing: ${dropViewSQL}`);
+                console.log(`Executing: ${dropViewSQL}`);
                 await connection.query(dropViewSQL);
                 const createViewSQL = diff.definition; // Use the expected definition to create the view
-                logger(`Executing: ${createViewSQL}`);
+                console.log(`Executing: ${createViewSQL}`);
                 await connection.query(createViewSQL);
             } else if (diff.type === 'extra_view') {
                 const dropViewSQL = `DROP VIEW IF EXISTS \`${diff.viewName}\`;`;
-                logger(`Executing: ${dropViewSQL}`);
+                console.log(`Executing: ${dropViewSQL}`);
                 await connection.query(dropViewSQL);
             } else if (diff.type === 'missing_trigger') {
                 const createTriggerSQL = diff.trigger.Definition;
                 logger('fixing trigger', diff.trigger.Name)
-                logger(`Executing: ${createTriggerSQL}`);
+                console.log(`Executing: ${createTriggerSQL}`);
                 await connection.query(createTriggerSQL);
             } else if (diff.type === 'mismatched_trigger') {
                 const dropTriggerSQL = `DROP TRIGGER IF EXISTS \`${diff.trigger.Name}\`;`;
-                logger(`Executing: ${dropTriggerSQL}`);
+                console.log(`Executing: ${dropTriggerSQL}`);
                 await connection.query(dropTriggerSQL);
                 const createTriggerSQL = diff.trigger.Definition;
-                logger(`Executing: ${createTriggerSQL}`);
+                console.log(`Executing: ${createTriggerSQL}`);
                 await connection.query(createTriggerSQL);
             } else if (diff.type === 'extra_trigger') {
                 const dropTriggerSQL = `DROP TRIGGER IF EXISTS \`${diff.trigger.Name}\`;`;
-                logger(`Executing: ${dropTriggerSQL}`);
+                console.log(`Executing: ${dropTriggerSQL}`);
                 await connection.query(dropTriggerSQL);
             }else if(diff.type === 'missing_database'){
                 logger('fixing missing database', diff.database)
                 const createDatabaseSQL = `CREATE DATABASE \`${diff.database}\`;`;
-                logger(`Executing: ${createDatabaseSQL}`);
+                console.log(`Executing: ${createDatabaseSQL}`);
                 await connection.query(createDatabaseSQL);
             } else {
                 logger(`Error applying difference of type:${diff.type}`, diff)