diff --git a/integration-tests/__tests__/deploy-database.spec.js b/integration-tests/__tests__/deploy-database.spec.js index 06d6269ea..f6b5291ee 100644 --- a/integration-tests/__tests__/deploy-database.spec.js +++ b/integration-tests/__tests__/deploy-database.spec.js @@ -586,6 +586,7 @@ describe('Deploy database', () => { { markDeleted: true, disallowExtraObjects: true, + allowDropStatements: true, } ); }) @@ -605,6 +606,7 @@ describe('Deploy database', () => { { markDeleted: true, disallowExtraObjects: true, + allowDropStatements: true, } ); }) diff --git a/packages/tools/src/alterPlan.ts b/packages/tools/src/alterPlan.ts index 1ad216d8f..9d7aafdb9 100644 --- a/packages/tools/src/alterPlan.ts +++ b/packages/tools/src/alterPlan.ts @@ -548,13 +548,13 @@ export class AlterPlan { if (this.opts.noDropTable && op.operationType == 'dropTable') return false; if (this.opts.noDropTable && op.operationType == 'recreateTable') return false; if (this.opts.noDropConstraint && op.operationType == 'dropConstraint') return false; - if ( - this.opts.noDropSqlObject && - op.operationType == 'dropSqlObject' && - // allow to drop previously deleted SQL objects - !hasDeletedPrefix(op.oldObject.pureName, this.opts, this.opts.deletedSqlObjectPrefix) - ) - return false; + // if ( + // this.opts.noDropSqlObject && + // op.operationType == 'dropSqlObject' && + // // allow to drop previously deleted SQL objects + // !hasDeletedPrefix(op.oldObject.pureName, this.opts, this.opts.deletedSqlObjectPrefix) + // ) + // return false; return true; }); } diff --git a/packages/tools/src/diffTools.ts b/packages/tools/src/diffTools.ts index ecccef9e5..f726c7e12 100644 --- a/packages/tools/src/diffTools.ts +++ b/packages/tools/src/diffTools.ts @@ -648,11 +648,7 @@ export function createAlterDatabasePlan( plan.dropSqlObject(oldobj); } } else { - if ( - opts.deletedSqlObjectPrefix && - driver.dialect.renameSqlObject && - hasDeletedPrefix(oldobj.pureName, opts, opts.deletedSqlObjectPrefix) - ) { + if (opts.deletedSqlObjectPrefix && hasDeletedPrefix(oldobj.pureName, opts, opts.deletedSqlObjectPrefix)) { plan.dropSqlObject(oldobj); plan.createSqlObject(newobj); } else if (!testEqualSqlObjects(oldobj, newobj, opts)) {