@strapi/database 5.0.0-beta.5 → 5.0.0-beta.7

package/dist/index.mjs

@@ -1144,14 +1144,6 @@ const createHelpers = (db) => {
   };
   const alterTable = async (schemaBuilder, table) => {
     await schemaBuilder.alterTable(table.name, (tableBuilder) => {
-      for (const removedIndex of table.indexes.removed) {
-        debug$2(`Dropping index ${removedIndex.name} on ${table.name}`);
-        dropIndex(tableBuilder, removedIndex);
-      }
-      for (const updateddIndex of table.indexes.updated) {
-        debug$2(`Dropping updated index ${updateddIndex.name} on ${table.name}`);
-        dropIndex(tableBuilder, updateddIndex.object);
-      }
       for (const removedForeignKey of table.foreignKeys.removed) {
         debug$2(`Dropping foreign key ${removedForeignKey.name} on ${table.name}`);
         dropForeignKey(tableBuilder, removedForeignKey);
@@ -1164,6 +1156,23 @@ const createHelpers = (db) => {
         debug$2(`Dropping column ${removedColumn.name} on ${table.name}`);
         dropColumn(tableBuilder, removedColumn);
       }
+      const isMySQL = db.config.connection.client === "mysql";
+      const ignoreForeignKeyNames = isMySQL ? [
+        ...table.foreignKeys.removed.map((fk) => fk.name),
+        ...table.foreignKeys.updated.map((fk) => fk.name)
+      ] : [];
+      for (const removedIndex of table.indexes.removed) {
+        if (!ignoreForeignKeyNames.includes(removedIndex.name)) {
+          debug$2(`Dropping index ${removedIndex.name} on ${table.name}`);
+          dropIndex(tableBuilder, removedIndex);
+        }
+      }
+      for (const updatedIndex of table.indexes.updated) {
+        if (!ignoreForeignKeyNames.includes(updatedIndex.name)) {
+          debug$2(`Dropping updated index ${updatedIndex.name} on ${table.name}`);
+          dropIndex(tableBuilder, updatedIndex.object);
+        }
+      }
       for (const updatedColumn of table.columns.updated) {
         debug$2(`Updating column ${updatedColumn.name} on ${table.name}`);
         const { object } = updatedColumn;
@@ -5986,15 +5995,13 @@ const migrateDocumentIdsWithLocalizations = async (db, knex2, meta) => {
   } while (ids.length > 0);
 };
 const migrationDocumentIds = async (db, knex2, meta) => {
-  let run = true;
+  let updatedRows;
   do {
-    const updatedRows = await knex2(meta.tableName).update({ document_id: createId() }).whereIn("id", (builder) => {
-      return builder.whereNull("document_id").select("id").limit(1);
-    });
-    if (updatedRows <= 0) {
-      run = false;
-    }
-  } while (run);
+    updatedRows = await knex2(meta.tableName).update({ document_id: createId() }).whereIn(
+      "id",
+      knex2(meta.tableName).select("id").from(knex2(meta.tableName).select("id").whereNull("document_id").limit(1).as("sub_query"))
+    );
+  } while (updatedRows > 0);
 };
 const createDocumentIdColumn = async (knex2, tableName) => {
   await knex2.schema.alterTable(tableName, (table) => {