mysqlsyncr 1.1.2 → 1.1.4

package/dist/index.cjs

@@ -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:
@@ -3629,7 +3629,7 @@ var applyDifferences = /*#__PURE__*/function () {
                   _context.next = 16;
                   return connection.query(createSQL);
                 case 16:
-                  _context.next = 210;
+                  _context.next = 213;
                   break;
                 case 18:
                   if (!(diff.type === 'extra_table')) {
@@ -3643,7 +3643,7 @@ var applyDifferences = /*#__PURE__*/function () {
                   _context.next = 25;
                   return connection.query(dropTableSQL);
                 case 25:
-                  _context.next = 210;
+                  _context.next = 213;
                   break;
                 case 27:
                   if (!(diff.type === 'missing_field')) {
@@ -3675,7 +3675,7 @@ var applyDifferences = /*#__PURE__*/function () {
                   _context.next = 43;
                   return connection.query(_modifyFieldSQL);
                 case 43:
-                  _context.next = 210;
+                  _context.next = 213;
                   break;
                 case 45:
                   if (!(diff.type === 'extra_field')) {
@@ -3687,30 +3687,33 @@ var applyDifferences = /*#__PURE__*/function () {
                   _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, ";");
-                  console.log("Executing: ".concat(_dropFieldSQL));
-                  _context.next = 59;
+                  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 = 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(', '), ");");
                   console.log("Executing: ".concat(primaryKeySQL));
-                  _context.next = 77;
-                  return connection.query(primaryKeySQL);
-                case 77:
                   _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(', '), ");");
                   console.log("Executing: ".concat(addIndexSQL));
-                  _context.next = 88;
-                  return connection.query(addIndexSQL);
-                case 88:
                   _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;");
                   console.log("Executing: ".concat(dropPrimaryKeySQL));
-                  _context.next = 99;
+                  _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, "`;");
                   console.log("Executing: ".concat(dropIndexSQL));
-                  _context.next = 105;
+                  _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;");
                   console.log("Executing: ".concat(_dropPrimaryKeySQL));
-                  _context.next = 114;
+                  _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, "`;");
                   console.log("Executing: ".concat(_dropIndexSQL));
-                  _context.next = 120;
+                  _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(', '), ");");
                   console.log("Executing: ".concat(addPrimaryKeySQL));
-                  _context.next = 127;
+                  _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
                   console.log("Executing: ".concat(_addIndexSQL));
-                  _context.next = 133;
+                  _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, "`;");
                   console.log("Executing: ".concat(dropCurrentProcSQL));
-                  _context.next = 140;
+                  _context.next = 143;
                   return connection.query(dropCurrentProcSQL);
-                case 140:
+                case 143:
                   // Create the procedure
                   createProcSQL = diff.Definition;
                   console.log("Executing: ".concat(createProcSQL)); // Log the SQL statement
-                  _context.next = 144;
+                  _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, "`;");
                   console.log("Executing: ".concat(dropViewSQL));
-                  _context.next = 151;
+                  _context.next = 154;
                   return connection.query(dropViewSQL);
-                case 151:
+                case 154:
                   createViewSQL = diff.definition; // Use the expected definition to create the view
                   console.log("Executing: ".concat(createViewSQL));
-                  _context.next = 155;
+                  _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, "`;");
                   console.log("Executing: ".concat(_dropViewSQL));
-                  _context.next = 162;
+                  _context.next = 165;
                   return connection.query(_dropViewSQL);
-                case 162:
+                case 165:
                   _createViewSQL = diff.definition; // Use the expected definition to create the view
                   console.log("Executing: ".concat(_createViewSQL));
-                  _context.next = 166;
+                  _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, "`;");
                   console.log("Executing: ".concat(_dropViewSQL2));
-                  _context.next = 173;
+                  _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);
                   console.log("Executing: ".concat(createTriggerSQL));
-                  _context.next = 181;
+                  _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, "`;");
                   console.log("Executing: ".concat(dropTriggerSQL));
-                  _context.next = 188;
+                  _context.next = 191;
                   return connection.query(dropTriggerSQL);
-                case 188:
+                case 191:
                   _createTriggerSQL = diff.trigger.Definition;
                   console.log("Executing: ".concat(_createTriggerSQL));
-                  _context.next = 192;
+                  _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, "`;");
                   console.log("Executing: ".concat(_dropTriggerSQL));
-                  _context.next = 199;
+                  _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, "`;");
                   console.log("Executing: ".concat(_createDatabaseSQL));
-                  _context.next = 207;
-                  return connection.query(_createDatabaseSQL);
-                case 207:
                   _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

@@ -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:
@@ -3626,7 +3626,7 @@ var applyDifferences = /*#__PURE__*/function () {
                   _context.next = 16;
                   return connection.query(createSQL);
                 case 16:
-                  _context.next = 210;
+                  _context.next = 213;
                   break;
                 case 18:
                   if (!(diff.type === 'extra_table')) {
@@ -3640,7 +3640,7 @@ var applyDifferences = /*#__PURE__*/function () {
                   _context.next = 25;
                   return connection.query(dropTableSQL);
                 case 25:
-                  _context.next = 210;
+                  _context.next = 213;
                   break;
                 case 27:
                   if (!(diff.type === 'missing_field')) {
@@ -3672,7 +3672,7 @@ var applyDifferences = /*#__PURE__*/function () {
                   _context.next = 43;
                   return connection.query(_modifyFieldSQL);
                 case 43:
-                  _context.next = 210;
+                  _context.next = 213;
                   break;
                 case 45:
                   if (!(diff.type === 'extra_field')) {
@@ -3684,30 +3684,33 @@ var applyDifferences = /*#__PURE__*/function () {
                   _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, ";");
-                  console.log("Executing: ".concat(_dropFieldSQL));
-                  _context.next = 59;
+                  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 = 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(', '), ");");
                   console.log("Executing: ".concat(primaryKeySQL));
-                  _context.next = 77;
-                  return connection.query(primaryKeySQL);
-                case 77:
                   _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(', '), ");");
                   console.log("Executing: ".concat(addIndexSQL));
-                  _context.next = 88;
-                  return connection.query(addIndexSQL);
-                case 88:
                   _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;");
                   console.log("Executing: ".concat(dropPrimaryKeySQL));
-                  _context.next = 99;
+                  _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, "`;");
                   console.log("Executing: ".concat(dropIndexSQL));
-                  _context.next = 105;
+                  _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;");
                   console.log("Executing: ".concat(_dropPrimaryKeySQL));
-                  _context.next = 114;
+                  _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, "`;");
                   console.log("Executing: ".concat(_dropIndexSQL));
-                  _context.next = 120;
+                  _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(', '), ");");
                   console.log("Executing: ".concat(addPrimaryKeySQL));
-                  _context.next = 127;
+                  _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
                   console.log("Executing: ".concat(_addIndexSQL));
-                  _context.next = 133;
+                  _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, "`;");
                   console.log("Executing: ".concat(dropCurrentProcSQL));
-                  _context.next = 140;
+                  _context.next = 143;
                   return connection.query(dropCurrentProcSQL);
-                case 140:
+                case 143:
                   // Create the procedure
                   createProcSQL = diff.Definition;
                   console.log("Executing: ".concat(createProcSQL)); // Log the SQL statement
-                  _context.next = 144;
+                  _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, "`;");
                   console.log("Executing: ".concat(dropViewSQL));
-                  _context.next = 151;
+                  _context.next = 154;
                   return connection.query(dropViewSQL);
-                case 151:
+                case 154:
                   createViewSQL = diff.definition; // Use the expected definition to create the view
                   console.log("Executing: ".concat(createViewSQL));
-                  _context.next = 155;
+                  _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, "`;");
                   console.log("Executing: ".concat(_dropViewSQL));
-                  _context.next = 162;
+                  _context.next = 165;
                   return connection.query(_dropViewSQL);
-                case 162:
+                case 165:
                   _createViewSQL = diff.definition; // Use the expected definition to create the view
                   console.log("Executing: ".concat(_createViewSQL));
-                  _context.next = 166;
+                  _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, "`;");
                   console.log("Executing: ".concat(_dropViewSQL2));
-                  _context.next = 173;
+                  _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);
                   console.log("Executing: ".concat(createTriggerSQL));
-                  _context.next = 181;
+                  _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, "`;");
                   console.log("Executing: ".concat(dropTriggerSQL));
-                  _context.next = 188;
+                  _context.next = 191;
                   return connection.query(dropTriggerSQL);
-                case 188:
+                case 191:
                   _createTriggerSQL = diff.trigger.Definition;
                   console.log("Executing: ".concat(_createTriggerSQL));
-                  _context.next = 192;
+                  _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, "`;");
                   console.log("Executing: ".concat(_dropTriggerSQL));
-                  _context.next = 199;
+                  _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, "`;");
                   console.log("Executing: ".concat(_createDatabaseSQL));
-                  _context.next = 207;
-                  return connection.query(_createDatabaseSQL);
-                case 207:
                   _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

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

package/src/apply.js

@@ -83,16 +83,24 @@ export const applyDifferences = async (connection, database, differences) => {
 
             } 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';
                 
-                const dropFieldSQL = `ALTER TABLE \`${tableName}\` CHANGE \`${field.Field}\` \`${field.Field}\` ${field.Type} ${field.NotNull ? 'NOT NULL' : ''} ${defaultClause};`;
-                console.log(`Executing: ${dropFieldSQL}`);
+                // 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}${hasOnUpdate ? ' ON UPDATE CURRENT_TIMESTAMP' : ''};`;
+                logger(`Executing: ${dropFieldSQL}`);
                 await connection.query(dropFieldSQL);
 
             } else if (diff.type === 'missing_index') {