@strapi/database 5.6.0 → 5.7.0

package/dist/dialects/dialect.d.ts

@@ -1,7 +1,9 @@
 import type { Database } from '..';
-import type { Schema } from '../schema';
+import type { ForeignKey, Index, Schema } from '../schema';
 export interface SchemaInspector {
     getSchema(): Promise<Schema>;
+    getIndexes(tableName: string): Promise<Index[]>;
+    getForeignKeys(tableName: string): Promise<ForeignKey[]>;
     getTables(): Promise<string[]>;
 }
 export default class Dialect {

package/dist/dialects/dialect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dialect.d.ts","sourceRoot":"","sources":["../../src/dialects/dialect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AACnC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAExC,MAAM,WAAW,eAAe;IAC9B,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7B,SAAS,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;CAChC;AAED,MAAM,CAAC,OAAO,OAAO,OAAO;IAC1B,EAAE,EAAE,QAAQ,CAAC;IAEb,eAAe,EAAE,eAAe,CAAyB;IAEzD,MAAM,EAAE,MAAM,CAAC;gBAEH,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM;IAMxC,SAAS,CAAC,IAAI,CAAC,EAAE,GAAG;IAGd,UAAU,CAAC,iBAAiB,CAAC,EAAE,OAAO;IAI5C,SAAS;IAIT,UAAU,CAAC,IAAI,EAAE,OAAO;IAIxB,mBAAmB;IAInB,eAAe;IAIf,YAAY;IAIZ,gBAAgB;IAIhB,gBAAgB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO;IAKtC,iBAAiB;IAIjB,eAAe;IAIrB,eAAe,CAAC,KAAK,EAAE,KAAK,GAAG;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE;IAQlD,gBAAgB;CAGjB"}
+{"version":3,"file":"dialect.d.ts","sourceRoot":"","sources":["../../src/dialects/dialect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AACnC,OAAO,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAE3D,MAAM,WAAW,eAAe;IAC9B,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7B,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IAChD,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;IACzD,SAAS,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;CAChC;AAED,MAAM,CAAC,OAAO,OAAO,OAAO;IAC1B,EAAE,EAAE,QAAQ,CAAC;IAEb,eAAe,EAAE,eAAe,CAAyB;IAEzD,MAAM,EAAE,MAAM,CAAC;gBAEH,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM;IAMxC,SAAS,CAAC,IAAI,CAAC,EAAE,GAAG;IAGd,UAAU,CAAC,iBAAiB,CAAC,EAAE,OAAO;IAI5C,SAAS;IAIT,UAAU,CAAC,IAAI,EAAE,OAAO;IAIxB,mBAAmB;IAInB,eAAe;IAIf,YAAY;IAIZ,gBAAgB;IAIhB,gBAAgB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO;IAKtC,iBAAiB;IAIjB,eAAe;IAIrB,eAAe,CAAC,KAAK,EAAE,KAAK,GAAG;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE;IAQlD,gBAAgB;CAGjB"}

package/dist/index.js

@@ -1071,6 +1071,13 @@ const createSchemaBuilder = (db) => {
     async updateSchema(schemaDiff) {
       const forceMigration = db.config.settings?.forceMigration;
       await db.dialect.startSchemaUpdate();
+      const existingMetadata = {};
+      for (const table of schemaDiff.tables.updated) {
+        existingMetadata[table.name] = {
+          indexes: await db.dialect.schemaInspector.getIndexes(table.name),
+          foreignKeys: await db.dialect.schemaInspector.getForeignKeys(table.name)
+        };
+      }
       await db.connection.transaction(async (trx) => {
         await this.createTables(schemaDiff.tables.added, trx);
         if (forceMigration) {
@@ -1088,7 +1095,8 @@ const createSchemaBuilder = (db) => {
         for (const table of schemaDiff.tables.updated) {
           debug$2(`Updating table: ${table.name}`);
           const schemaBuilder = this.getSchemaBuilder(trx);
-          await helpers2.alterTable(schemaBuilder, table);
+          const { indexes, foreignKeys } = existingMetadata[table.name];
+          await helpers2.alterTable(schemaBuilder, table, { indexes, foreignKeys });
         }
       });
       await db.dialect.endSchemaUpdate();
@@ -1096,8 +1104,14 @@ const createSchemaBuilder = (db) => {
   };
 };
 const createHelpers = (db) => {
-  const createForeignKey = (tableBuilder, foreignKey) => {
+  const createForeignKey = (tableBuilder, foreignKey, existingForeignKeys) => {
     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);
@@ -1110,25 +1124,34 @@ const createHelpers = (db) => {
     const { name, columns } = foreignKey;
     tableBuilder.dropForeign(columns, name);
   };
-  const createIndex = (tableBuilder, index2) => {
+  const createIndex = (tableBuilder, index2, existingIndexes) => {
     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, name);
+        return tableBuilder.primary(columns, { constraintName: name });
       }
       case "unique": {
-        return tableBuilder.unique(columns, name);
+        return tableBuilder.unique(columns, { indexName: name });
       }
       default: {
         return tableBuilder.index(columns, name, type);
       }
     }
   };
-  const dropIndex2 = (tableBuilder, index2) => {
+  const dropIndex2 = (tableBuilder, index2, existingIndexes) => {
     if (!db.config.settings?.forceMigration) {
       return;
     }
     const { type, columns, name } = index2;
+    if (existingIndexes && !existingIndexes.some((existingIndex) => existingIndex?.name === name)) {
+      debug$2(`Index ${index2.name} not found in existingIndexes. Skipping drop.`);
+      return;
+    }
     switch (type) {
       case "primary": {
         return tableBuilder.dropPrimary(name);
@@ -1179,32 +1202,36 @@ const createHelpers = (db) => {
       }
     });
   };
-  const alterTable = async (schemaBuilder, table) => {
-    await schemaBuilder.alterTable(table.name, (tableBuilder) => {
+  const alterTable = async (schemaBuilder, table, existingMetadata = {
+    indexes: [],
+    foreignKeys: []
+  }) => {
+    let existingIndexes = [...existingMetadata.indexes];
+    const existingForeignKeys = [...existingMetadata.foreignKeys];
+    const droppedForeignKeyNames = [];
+    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);
+        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);
+        droppedForeignKeyNames.push(updatedForeignKey.object.name);
+      }
+      if (db.config.connection.client === "mysql") {
+        existingIndexes = existingIndexes.filter(
+          (index2) => !droppedForeignKeyNames.includes(index2.name)
+        );
       }
-      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}`);
-          dropIndex2(tableBuilder, removedIndex);
-        }
+        debug$2(`Dropping index ${removedIndex.name} on ${table.name}`);
+        dropIndex2(tableBuilder, removedIndex, existingIndexes);
       }
       for (const updatedIndex of table.indexes.updated) {
-        if (!ignoreForeignKeyNames.includes(updatedIndex.name)) {
-          debug$2(`Dropping updated index ${updatedIndex.name} on ${table.name}`);
-          dropIndex2(tableBuilder, updatedIndex.object);
-        }
+        debug$2(`Dropping updated index ${updatedIndex.name} on ${table.name}`);
+        dropIndex2(tableBuilder, updatedIndex.object, existingIndexes);
       }
       for (const removedColumn of table.columns.removed) {
         debug$2(`Dropping column ${removedColumn.name} on ${table.name}`);
@@ -1230,19 +1257,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);
+        createForeignKey(tableBuilder, updatedForeignKey.object, existingForeignKeys);
       }
       for (const updatedIndex of table.indexes.updated) {
         debug$2(`Recreating updated index ${updatedIndex.name} on ${table.name}`);
-        createIndex(tableBuilder, updatedIndex.object);
+        createIndex(tableBuilder, updatedIndex.object, existingIndexes);
       }
       for (const addedForeignKey of table.foreignKeys.added) {
-        debug$2(`Creating foreign keys ${addedForeignKey.name} on ${table.name}`);
-        createForeignKey(tableBuilder, addedForeignKey);
+        debug$2(`Creating foreign key ${addedForeignKey.name} on ${table.name}`);
+        createForeignKey(tableBuilder, addedForeignKey, existingForeignKeys);
       }
       for (const addedIndex of table.indexes.added) {
         debug$2(`Creating index ${addedIndex.name} on ${table.name}`);
-        createIndex(tableBuilder, addedIndex);
+        createIndex(tableBuilder, addedIndex, existingIndexes);
       }
     });
   };