@strapi/database 5.7.0 → 5.8.0

package/dist/index.mjs

@@ -1072,14 +1072,8 @@ const createSchemaBuilder = (db) => {
   };
 };
 const createHelpers = (db) => {
-  const createForeignKey = (tableBuilder, foreignKey, existingForeignKeys) => {
+  const createForeignKey = (tableBuilder, foreignKey) => {
     const { name, columns, referencedColumns, referencedTable, onDelete, onUpdate } = foreignKey;
-    const existingForeignKey = existingForeignKeys?.find((fk) => fk.name === name);
-    const forceMigration = db.config.settings?.forceMigration;
-    if (existingForeignKey && forceMigration) {
-      debug$2(`Dropping existing foreign key ${name}`);
-      tableBuilder.dropForeign(existingForeignKey.columns, name);
-    }
     const constraint = tableBuilder.foreign(columns, name).references(referencedColumns).inTable(db.getSchemaName() ? `${db.getSchemaName()}.${referencedTable}` : referencedTable);
     if (onDelete) {
       constraint.onDelete(onDelete);
@@ -1088,17 +1082,16 @@ const createHelpers = (db) => {
       constraint.onUpdate(onUpdate);
     }
   };
-  const dropForeignKey = (tableBuilder, foreignKey) => {
+  const dropForeignKey = (tableBuilder, foreignKey, existingForeignKeys) => {
     const { name, columns } = foreignKey;
+    if (existingForeignKeys && !existingForeignKeys.some((existingIndex) => existingIndex?.name === name)) {
+      debug$2(`Foreign Key ${name} not found in existing foreign keys. Skipping drop.`);
+      return;
+    }
     tableBuilder.dropForeign(columns, name);
   };
-  const createIndex = (tableBuilder, index2, existingIndexes) => {
+  const createIndex = (tableBuilder, index2) => {
     const { type, columns, name } = index2;
-    const existingIndex = existingIndexes?.find((existing) => existing.name === name);
-    const forceMigration = db.config.settings?.forceMigration;
-    if (forceMigration && existingIndex) {
-      dropIndex2(tableBuilder, index2);
-    }
     switch (type) {
       case "primary": {
         return tableBuilder.primary(columns, { constraintName: name });
@@ -1180,12 +1173,12 @@ const createHelpers = (db) => {
     await schemaBuilder.alterTable(table.name, async (tableBuilder) => {
       for (const removedForeignKey of table.foreignKeys.removed) {
         debug$2(`Dropping foreign key ${removedForeignKey.name} on ${table.name}`);
-        dropForeignKey(tableBuilder, removedForeignKey);
+        dropForeignKey(tableBuilder, removedForeignKey, existingForeignKeys);
         droppedForeignKeyNames.push(removedForeignKey.name);
       }
       for (const updatedForeignKey of table.foreignKeys.updated) {
         debug$2(`Dropping updated foreign key ${updatedForeignKey.name} on ${table.name}`);
-        dropForeignKey(tableBuilder, updatedForeignKey.object);
+        dropForeignKey(tableBuilder, updatedForeignKey.object, existingForeignKeys);
         droppedForeignKeyNames.push(updatedForeignKey.object.name);
       }
       if (db.config.connection.client === "mysql") {
@@ -1225,19 +1218,19 @@ const createHelpers = (db) => {
       }
       for (const updatedForeignKey of table.foreignKeys.updated) {
         debug$2(`Recreating updated foreign key ${updatedForeignKey.name} on ${table.name}`);
-        createForeignKey(tableBuilder, updatedForeignKey.object, existingForeignKeys);
+        createForeignKey(tableBuilder, updatedForeignKey.object);
       }
       for (const updatedIndex of table.indexes.updated) {
         debug$2(`Recreating updated index ${updatedIndex.name} on ${table.name}`);
-        createIndex(tableBuilder, updatedIndex.object, existingIndexes);
+        createIndex(tableBuilder, updatedIndex.object);
       }
       for (const addedForeignKey of table.foreignKeys.added) {
         debug$2(`Creating foreign key ${addedForeignKey.name} on ${table.name}`);
-        createForeignKey(tableBuilder, addedForeignKey, existingForeignKeys);
+        createForeignKey(tableBuilder, addedForeignKey);
       }
       for (const addedIndex of table.indexes.added) {
         debug$2(`Creating index ${addedIndex.name} on ${table.name}`);
-        createIndex(tableBuilder, addedIndex, existingIndexes);
+        createIndex(tableBuilder, addedIndex);
       }
     });
   };