Skip to content

fix(drizzle-kit): add a short circuit to created/renamed prompts #5873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yonathan-ashebir wants to merge 1 commit into
base: main
Choose a base branch
from
+27 −0
Open

fix(drizzle-kit): add a short circuit to created/renamed prompts #5873

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions drizzle-kit/src/cli/commands/migrate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1083,6 +1083,12 @@ export const promptColumnsConflicts = async <T extends Named>(
do {
const created = newColumns[index];

// if there are no more missing columns to resolve, consider the rest of new columns as created
if (leftMissing.length === 0) {
result.created.push(...newColumns.slice(index));
break;
}

const renames: RenamePropmtItem<T>[] = leftMissing.map((it) => {
return { from: it, to: created };
});
Expand Down Expand Up @@ -1156,6 +1162,13 @@ export const promptNamedConflict = async <T extends Named>(
let leftMissing = [...missingItems];
do {
const created = newItems[index];

// if there are no more missing items to resolve, consider the rest of new items as created
if (leftMissing.length === 0) {
result.created.push(...newItems.slice(index));
break;
}

const renames: RenamePropmtItem<T>[] = leftMissing.map((it) => {
return { from: it, to: created };
});
Expand Down Expand Up @@ -1231,6 +1244,13 @@ export const promptNamedWithSchemasConflict = async <T extends NamedWithSchema>(
let leftMissing = [...missingItems];
do {
const created = newItems[index];

// if there are no more missing items to resolve, consider the rest of new items as created
if (leftMissing.length === 0) {
result.created.push(...newItems.slice(index));
break;
}

const renames: RenamePropmtItem<T>[] = leftMissing.map((it) => {
return { from: it, to: created };
});
Expand Down Expand Up @@ -1309,6 +1329,13 @@ export const promptSchemasConflict = async <T extends Named>(
let leftMissing = [...missingSchemas];
do {
const created = newSchemas[index];

// if there are no more missing schemas to resolve, consider the rest of new schemas as created
if (leftMissing.length === 0) {
result.created.push(...newSchemas.slice(index));
break;
}

const renames: RenamePropmtItem<T>[] = leftMissing.map((it) => {
return { from: it, to: created };
});
Expand Down