yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-28 15:44:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(database): only drop indexes that exist; do not drop on create (#22633)

Browse Source 
* fix(database): verify existance on drop but do not drop on create

* revert: keep mysql conditional
This commit is contained in:
Ben Irvin 2025-01-14 16:44:14 +01:00 committed by GitHub
parent 0af49f5c5e
commit 14fd433d38
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 22 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
packages/core/database/src/schema/builder.ts
View File

@ -122,22 +122,9 @@ const createHelpers = (db: Database) => {
/**
* Creates a foreign key on a table
*/
const createForeignKey = (
tableBuilder: Knex.TableBuilder,
foreignKey: ForeignKey,
existingForeignKeys?: ForeignKey[]
) => {
const createForeignKey = (tableBuilder: Knex.TableBuilder, foreignKey: ForeignKey) => {
const { name, columns, referencedColumns, referencedTable, onDelete, onUpdate } = foreignKey;
// Check if it already exists, and if so drop it before creating
// Note that it is safe to drop multiple times with TableBuilder because it only uses it to define the schema
const existingForeignKey = existingForeignKeys?.find((fk) => fk.name === name);
const forceMigration = db.config.settings?.forceMigration;
if (existingForeignKey && forceMigration) {
debug(`Dropping existing foreign key ${name}`);
tableBuilder.dropForeign(existingForeignKey.columns, name);
}
const constraint = tableBuilder
.foreign(columns, name)
.references(referencedColumns)
@ -155,30 +142,31 @@ const createHelpers = (db: Database) => {
/**
* Drops a foreign key from a table
*/
const dropForeignKey = (tableBuilder: Knex.TableBuilder, foreignKey: ForeignKey) => {
const dropForeignKey = (
tableBuilder: Knex.TableBuilder,
foreignKey: ForeignKey,
existingForeignKeys?: ForeignKey[]
) => {
const { name, columns } = foreignKey;
// Check if the index exists in existingIndexes, and return early if it doesn't
if (
existingForeignKeys &&
!existingForeignKeys.some((existingIndex) => existingIndex?.name === name)
) {
debug(`Foreign Key ${name} not found in existing foreign keys. Skipping drop.`);
return;
}
tableBuilder.dropForeign(columns, name);
};
/**
* Creates an index on a table
*/
const createIndex = (
tableBuilder: Knex.TableBuilder,
index: Index,
existingIndexes?: Index[]
) => {
const createIndex = (tableBuilder: Knex.TableBuilder, index: Index) => {
const { type, columns, name } = index;
// Check if it already exists, and if so drop it before creating
// Note that it is safe to drop multiple times with TableBuilder because it only uses it to define the schema
const existingIndex = existingIndexes?.find((existing) => existing.name === name);
const forceMigration = db.config.settings?.forceMigration;
if (forceMigration && existingIndex) {
dropIndex(tableBuilder, index);
}
switch (type) {
case 'primary': {
return tableBuilder.primary(columns, { constraintName: name });
@ -316,14 +304,14 @@ const createHelpers = (db: Database) => {
// Drop foreign keys first to avoid foreign key errors in the following steps
for (const removedForeignKey of table.foreignKeys.removed) {
debug(`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(`Dropping updated foreign key ${updatedForeignKey.name} on ${table.name}`);
dropForeignKey(tableBuilder, updatedForeignKey.object);
dropForeignKey(tableBuilder, updatedForeignKey.object, existingForeignKeys);
droppedForeignKeyNames.push(updatedForeignKey.object.name);
}
@ -380,22 +368,22 @@ const createHelpers = (db: Database) => {
// once the columns have all been updated, we can create indexes again
for (const updatedForeignKey of table.foreignKeys.updated) {
debug(`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(`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(`Creating foreign key ${addedForeignKey.name} on ${table.name}`);
createForeignKey(tableBuilder, addedForeignKey, existingForeignKeys);
createForeignKey(tableBuilder, addedForeignKey);
}
for (const addedIndex of table.indexes.added) {
debug(`Creating index ${addedIndex.name} on ${table.name}`);
createIndex(tableBuilder, addedIndex, existingIndexes);
createIndex(tableBuilder, addedIndex);
}
});
};