Skip to content

Deduplicate SQL statements during push operations #5032

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
tmkx wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −20
Open

Deduplicate SQL statements during push operations #5032

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
38 changes: 18 additions & 20 deletions drizzle-kit/src/cli/commands/push.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,8 @@ export const mysqlPush = async (

const filteredSqlStatements = fromJson(filteredStatements, 'mysql');

const uniqueSqlStatementsToExecute: string[] = [];
statementsToExecute.forEach((ss) => {
if (!uniqueSqlStatementsToExecute.includes(ss)) {
uniqueSqlStatementsToExecute.push(ss);
}
});
const uniqueFilteredSqlStatements: string[] = [];
filteredSqlStatements.forEach((ss) => {
if (!uniqueFilteredSqlStatements.includes(ss)) {
uniqueFilteredSqlStatements.push(ss);
}
});
const uniqueSqlStatementsToExecute = Array.from(new Set(statementsToExecute));
const uniqueFilteredSqlStatements = Array.from(new Set(filteredSqlStatements));

if (verbose) {
console.log();
Expand Down Expand Up @@ -211,13 +201,15 @@ export const singlestorePush = async (
statements.validatedPrev,
);

const uniqueSqlStatementsToExecute = Array.from(new Set(statementsToExecute));

if (verbose) {
console.log();
console.log(
withStyle.warning('You are about to execute current statements:'),
);
console.log();
console.log(statementsToExecute.map((s) => chalk.blue(s)).join('\n'));
console.log(uniqueSqlStatementsToExecute.map((s) => chalk.blue(s)).join('\n'));
console.log();
}

Expand Down Expand Up @@ -271,7 +263,7 @@ export const singlestorePush = async (
}
}

for (const dStmnt of statementsToExecute) {
for (const dStmnt of uniqueSqlStatementsToExecute) {
await db.query(dStmnt);
}

Expand Down Expand Up @@ -328,14 +320,16 @@ export const pgPush = async (
schemasToRemove,
} = await pgSuggestions(db, statements.statements);

const uniqueSqlStatementsToExecute = Array.from(new Set(statementsToExecute));

if (verbose) {
console.log();
// console.log(chalk.gray('Verbose logs:'));
console.log(
withStyle.warning('You are about to execute current statements:'),
);
console.log();
console.log(statementsToExecute.map((s) => chalk.blue(s)).join('\n'));
console.log(uniqueSqlStatementsToExecute.map((s) => chalk.blue(s)).join('\n'));
console.log();
}

Expand Down Expand Up @@ -395,7 +389,7 @@ export const pgPush = async (
}
}

for (const dStmnt of statementsToExecute) {
for (const dStmnt of uniqueSqlStatementsToExecute) {
await db.query(dStmnt);
}

Expand Down Expand Up @@ -447,13 +441,15 @@ export const sqlitePush = async (
statements.meta!,
);

const uniqueSqlStatementsToExecute = Array.from(new Set(statementsToExecute));

if (verbose && statementsToExecute.length > 0) {
console.log();
console.log(
withStyle.warning('You are about to execute current statements:'),
);
console.log();
console.log(statementsToExecute.map((s) => chalk.blue(s)).join('\n'));
console.log(uniqueSqlStatementsToExecute.map((s) => chalk.blue(s)).join('\n'));
console.log();
}

Expand Down Expand Up @@ -517,7 +513,7 @@ export const sqlitePush = async (
const isNotD1 = !('driver' in credentials && credentials.driver === 'd1-http');
isNotD1 ?? await db.run('begin');
try {
for (const dStmnt of statementsToExecute) {
for (const dStmnt of uniqueSqlStatementsToExecute) {
await db.run(dStmnt);
}
isNotD1 ?? await db.run('commit');
Expand Down Expand Up @@ -568,13 +564,15 @@ export const libSQLPush = async (
statements.meta!,
);

const uniqueSqlStatementsToExecute = Array.from(new Set(statementsToExecute));

if (verbose && statementsToExecute.length > 0) {
console.log();
console.log(
withStyle.warning('You are about to execute current statements:'),
);
console.log();
console.log(statementsToExecute.map((s) => chalk.blue(s)).join('\n'));
console.log(uniqueSqlStatementsToExecute.map((s) => chalk.blue(s)).join('\n'));
console.log();
}

Expand Down Expand Up @@ -632,7 +630,7 @@ export const libSQLPush = async (
if (statementsToExecute.length === 0) {
render(`\n[${chalk.blue('i')}] No changes detected`);
} else {
await db.batchWithPragma!(statementsToExecute);
await db.batchWithPragma!(uniqueSqlStatementsToExecute);
render(`[${chalk.green('✓')}] Changes applied`);
}
}
Expand Down