Skip to content

[SQLite-kit]: make index drop/recreate idempotent for libSQL/Turso push #5607

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
MorganTitcher wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[SQLite-kit]: make index drop/recreate idempotent for libSQL/Turso push #5607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db327ca
fix(drizzle-kit): idempotent index drop/recreate for Turso column modify
cursoragent Apr 6, 2026
4155da2
test(drizzle-kit): update SQLite/Turso push expectations for #5564
cursoragent Apr 6, 2026
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
6 changes: 3 additions & 3 deletions drizzle-kit/src/sqlgenerator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2407,7 +2407,7 @@ export class LibSQLModifyColumn extends Convertor {
for (const table of Object.values(json2.tables)) {
for (const index of Object.values(table.indexes)) {
const unsquashed = SQLiteSquasher.unsquashIdx(index);
sqlStatements.push(`DROP INDEX "${unsquashed.name}";`);
sqlStatements.push(`DROP INDEX IF EXISTS "${unsquashed.name}";`);
indexes.push({ ...unsquashed, tableName: table.name });
}
}
Expand Down Expand Up @@ -2473,7 +2473,7 @@ export class LibSQLModifyColumn extends Convertor {
const tableName = index.tableName;

sqlStatements.push(
`CREATE ${indexPart} \`${index.name}\` ON \`${tableName}\` (${uniqueString})${whereStatement};`,
`CREATE ${indexPart} IF NOT EXISTS \`${index.name}\` ON \`${tableName}\` (${uniqueString})${whereStatement};`,
);
}

Expand Down Expand Up @@ -3735,7 +3735,7 @@ export class SqliteDropIndexConvertor extends Convertor {

convert(statement: JsonDropIndexStatement): string {
const { name } = PgSquasher.unsquashIdx(statement.data);
return `DROP INDEX \`${name}\`;`;
return `DROP INDEX IF EXISTS \`${name}\`;`;
}
}

Expand Down
12 changes: 6 additions & 6 deletions drizzle-kit/tests/libsql-statements.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,13 +917,13 @@ test('set not null with index', async (t) => {

expect(sqlStatements.length).toBe(3);
expect(sqlStatements[0]).toBe(
`DROP INDEX "users_name_index";`,
`DROP INDEX IF EXISTS "users_name_index";`,
);
expect(sqlStatements[1]).toBe(
`ALTER TABLE \`users\` ALTER COLUMN "name" TO "name" text NOT NULL;`,
);
expect(sqlStatements[2]).toBe(
`CREATE INDEX \`users_name_index\` ON \`users\` (\`name\`);`,
`CREATE INDEX IF NOT EXISTS \`users_name_index\` ON \`users\` (\`name\`);`,
);
});

Expand Down Expand Up @@ -972,18 +972,18 @@ test('drop not null with two indexes', async (t) => {

expect(sqlStatements.length).toBe(5);
expect(sqlStatements[0]).toBe(
`DROP INDEX "users_name_unique";`,
`DROP INDEX IF EXISTS "users_name_unique";`,
);
expect(sqlStatements[1]).toBe(
`DROP INDEX "users_age_index";`,
`DROP INDEX IF EXISTS "users_age_index";`,
);
expect(sqlStatements[2]).toBe(
`ALTER TABLE \`users\` ALTER COLUMN "name" TO "name" text;`,
);
expect(sqlStatements[3]).toBe(
`CREATE UNIQUE INDEX \`users_name_unique\` ON \`users\` (\`name\`);`,
`CREATE UNIQUE INDEX IF NOT EXISTS \`users_name_unique\` ON \`users\` (\`name\`);`,
);
expect(sqlStatements[4]).toBe(
`CREATE INDEX \`users_age_index\` ON \`users\` (\`age\`);`,
`CREATE INDEX IF NOT EXISTS \`users_age_index\` ON \`users\` (\`age\`);`,
);
});
81 changes: 74 additions & 7 deletions drizzle-kit/tests/push/libsql.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ test('added, dropped index', async (t) => {

expect(sqlStatements.length).toBe(2);
expect(sqlStatements[0]).toBe(
`DROP INDEX \`customers_address_unique\`;`,
`DROP INDEX IF EXISTS \`customers_address_unique\`;`,
);
expect(sqlStatements[1]).toBe(
`CREATE UNIQUE INDEX \`customers_is_confirmed_unique\` ON \`customers\` (\`is_confirmed\`);`,
Expand Down Expand Up @@ -963,13 +963,13 @@ test('set not null with index', async (t) => {

expect(sqlStatements.length).toBe(3);
expect(sqlStatements[0]).toBe(
`DROP INDEX "users_name_index";`,
`DROP INDEX IF EXISTS "users_name_index";`,
);
expect(sqlStatements[1]).toBe(
`ALTER TABLE \`users\` ALTER COLUMN "name" TO "name" text NOT NULL;`,
);
expect(sqlStatements[2]).toBe(
`CREATE INDEX \`users_name_index\` ON \`users\` (\`name\`);`,
`CREATE INDEX IF NOT EXISTS \`users_name_index\` ON \`users\` (\`name\`);`,
);
expect(columnsToRemove!.length).toBe(0), expect(infoToPrint!.length).toBe(0);
expect(shouldAskForApprove).toBe(false);
Expand Down Expand Up @@ -1035,26 +1035,93 @@ test('drop not null with two indexes', async (t) => {

expect(sqlStatements.length).toBe(5);
expect(sqlStatements[0]).toBe(
`DROP INDEX "users_name_unique";`,
`DROP INDEX IF EXISTS "users_name_unique";`,
);
expect(sqlStatements[1]).toBe(
`DROP INDEX "users_age_index";`,
`DROP INDEX IF EXISTS "users_age_index";`,
);
expect(sqlStatements[2]).toBe(
`ALTER TABLE \`users\` ALTER COLUMN "name" TO "name" text;`,
);
expect(sqlStatements[3]).toBe(
`CREATE UNIQUE INDEX \`users_name_unique\` ON \`users\` (\`name\`);`,
`CREATE UNIQUE INDEX IF NOT EXISTS \`users_name_unique\` ON \`users\` (\`name\`);`,
);
expect(sqlStatements[4]).toBe(
`CREATE INDEX \`users_age_index\` ON \`users\` (\`age\`);`,
`CREATE INDEX IF NOT EXISTS \`users_age_index\` ON \`users\` (\`age\`);`,
);
expect(columnsToRemove!.length).toBe(0), expect(infoToPrint!.length).toBe(0);
expect(shouldAskForApprove).toBe(false);
expect(tablesToRemove!.length).toBe(0);
expect(tablesToTruncate!.length).toBe(0);
});

test('set not null on two tables with indexes in one push (#5564)', async (t) => {
const turso = createClient({
url: ':memory:',
});

const schema1 = {
users: sqliteTable('users', {
id: text('id').primaryKey(),
email: text('email').notNull(),
name: text('name'),
}, (table) => ({
emailIdx: uniqueIndex('users_email_idx').on(table.email),
})),
projects: sqliteTable('projects', {
id: text('id').primaryKey(),
ownerId: text('owner_id').notNull(),
title: text('title'),
}, (table) => ({
ownerIdx: index('projects_owner_idx').on(table.ownerId),
})),
};

const schema2 = {
users: sqliteTable('users', {
id: text('id').primaryKey(),
email: text('email').notNull(),
name: text('name').notNull(),
}, (table) => ({
emailIdx: uniqueIndex('users_email_idx').on(table.email),
})),
projects: sqliteTable('projects', {
id: text('id').primaryKey(),
ownerId: text('owner_id').notNull(),
title: text('title').notNull(),
}, (table) => ({
ownerIdx: index('projects_owner_idx').on(table.ownerId),
})),
};

const {
statements,
sqlStatements,
columnsToRemove,
infoToPrint,
shouldAskForApprove,
tablesToRemove,
tablesToTruncate,
} = await diffTestSchemasPushLibSQL(
turso,
schema1,
schema2,
[],
);

expect(statements!.length).toBe(2);
expect(statements!.every((s) => s.type === 'alter_table_alter_column_set_notnull')).toBe(true);

const dropLines = sqlStatements.filter((s) => s.startsWith('DROP INDEX'));
expect(dropLines.every((s) => s.includes('IF EXISTS'))).toBe(true);

expect(columnsToRemove!.length).toBe(0);
expect(infoToPrint!.length).toBe(0);
expect(shouldAskForApprove).toBe(false);
expect(tablesToRemove!.length).toBe(0);
expect(tablesToTruncate!.length).toBe(0);
});

test('add check constraint to table', async (t) => {
const turso = createClient({
url: ':memory:',
Expand Down
2 changes: 1 addition & 1 deletion drizzle-kit/tests/push/sqlite.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ test('dropped, added unique index', async (t) => {

expect(sqlStatements.length).toBe(2);
expect(sqlStatements[0]).toBe(
`DROP INDEX \`customers_address_unique\`;`,
`DROP INDEX IF EXISTS \`customers_address_unique\`;`,
);
expect(sqlStatements[1]).toBe(
`CREATE UNIQUE INDEX \`customers_is_confirmed_unique\` ON \`customers\` (\`is_confirmed\`);`,
Expand Down