fix(cli): make migration batches transactional (CLI-2261) by 7ttp · Pull Request #6354 · supabase/cli

7ttp · 2026-08-27T09:28:56Z

TL;DR

fixes supabase db reset failing with SQLSTATE 25P01 on migrations that use LOCK TABLE

what's biting?

Since fix(cli): batch migration statements (CLI-2182) #6224 the TS apply pipelines a migration file over the extended protocol. PostgreSQL treats that pipeline as neither in nor out of a transaction block,
so RequireTransactionBlock statements like LOCK TABLE, SET LOCAL and DECLARE ... WITH HOLD fail with 25P01, db reset stops at that migration, and the database is left half migrated and unseeded.
The Go CLI ran these batches inside a real transaction block, so the same migrations applied through 2.114.0...

now fixed by:

LegacyPgBatchQuery brackets each batch in BEGIN and COMMIT inside the same frame run with one Sync,
so the batch is a genuine transaction block....

the wrapper statements never count toward statementIndex, so At statement numbering is unchanged.
a failed batch rolls its transaction back on the release path, bounded to one second, and the pooled client is discarded when the rollback fails or times out.
Pipeline incompatible statements still run standalone via the existing classifier, and files with authored transaction control still run sequentially...

ref:

closes: db reset: pipelined migration batch is not a transaction block, so LOCK TABLE fails with 25P01 (regression in 2.115.0) #6347

… (CLI-2261)

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit:30ba92cbd5

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

github-actions · 2026-08-27T09:50:17Z

Supabase CLI preview

npx --yes https://pkg.pr.new/supabase/cli/supabase@ce99a402b3090bf543fbdd6935370784369590a6

Preview package for commit ce99a40.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit:ce99a402b3

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit:32335b4539

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit:8335bfffb9

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit:7f55c997c2

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit:605f369e0f

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

chatgpt-codex-connector · 2026-08-27T11:29:02Z

+const TABLESPACE_DDL_PATTERN = /^(?:CREATE|DROP)\s+TABLESPACE(?:\s|$)/u;
+const REINDEX_DATABASE_PATTERN = /^REINDEX(?:\s+\([^)]*\))?\s+(?:DATABASE|SYSTEM|SCHEMA)(?:\s|$)/u;
+const SUBSCRIPTION_DDL_PATTERN = /^(?:CREATE|DROP)\s+SUBSCRIPTION(?:\s|$)/u;
+const DISCARD_ALL_PATTERN = /^DISCARD\s+ALL(?:\s|$)/u;


Route CHECKPOINT outside transactional batches
When a migration contains top-level CHECKPOINT, this predicate leaves it in the new BEGIN/COMMIT wrapper, so PostgreSQL rejects the migration with SQLSTATE 25001 even though the previous unwrapped pipeline could execute it. Fresh evidence after the earlier classifier fixes is that both the final predicate and the updated SIDE_EFFECTS.md list still omit CHECKPOINT; add it to the standalone classification and documentation.
AGENTS.md reference: apps/cli/AGENTS.md:L267-L279
Useful? React with 👍 / 👎.

7ttp · 2026-08-27T12:01:33Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit:a6bd7327e7

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

fix(cli): wrap pipelined migration batches in an explicit transaction…
30ba92c
… (CLI-2261)

7ttp self-assigned this Aug 27, 2026

7ttp marked this pull request as ready for review August 27, 2026 09:43

7ttp requested a review from a team as a code owner August 27, 2026 09:43

chatgpt-codex-connectorBot reviewed Aug 27, 2026
View reviewed changes

Comment threadapps/cli/src/legacy/shared/legacy-db-connection.sql-pg.layer.ts
Comment threadapps/cli/src/legacy/shared/legacy-db-connection.service.ts
Comment threadapps/cli/src/legacy/shared/legacy-db-connection.sql-pg.unit.test.ts Outdated

7ttp added 3 commits August 27, 2026 15:27

fix: run transaction-prohibited ddl standalone
7a71865

docs: align push side effects with transactional batches
57f3ebb

test: assert batch errors via instanceof
ce99a40

chatgpt-codex-connectorBot reviewed Aug 27, 2026
View reviewed changes

Comment threadapps/cli/src/legacy/shared/legacy-db-connection.sql-pg.layer.ts Outdated
Comment threadapps/cli/src/legacy/shared/legacy-migration-apply.ts Outdated

fix: route subscription ddl standalone
32335b4

7ttp marked this pull request as draft August 27, 2026 10:13

fix: roll failed batches back while interruptible
5afa6f7

chatgpt-codex-connectorBot reviewed Aug 27, 2026
View reviewed changes

Comment threadapps/cli/src/legacy/shared/legacy-migration-apply.ts Outdated

fix: run discard all standalone with role restore
8335bff

chatgpt-codex-connectorBot reviewed Aug 27, 2026
View reviewed changes

Comment threadapps/cli/src/legacy/shared/legacy-migration-apply.ts Outdated

fix: route reindex schema standalone
7f55c99

chatgpt-codex-connectorBot reviewed Aug 27, 2026
View reviewed changes

Comment threadapps/cli/src/legacy/shared/legacy-db-connection.sql-pg.layer.ts
Comment threadapps/cli/src/legacy/shared/legacy-migration-apply.ts
Comment threadapps/cli/src/legacy/shared/legacy-migration-apply.ts

7ttp added 2 commits August 27, 2026 16:31

fix: route alter database set tablespace standalone
35acc1b

fix: route subscription refresh forms standalone
605f369

chatgpt-codex-connectorBot reviewed Aug 27, 2026
View reviewed changes

docs: align migration up standalone list
a6bd732

chatgpt-codex-connectorBot reviewed Aug 27, 2026
View reviewed changes

Comment threadapps/cli/src/legacy/shared/legacy-db-connection.sql-pg.layer.ts
Comment threadapps/cli/src/legacy/shared/legacy-migration-apply.ts
Comment threadapps/cli/src/legacy/shared/legacy-migration-apply.ts
Comment threadapps/cli/src/legacy/shared/legacy-db-connection.sql-pg.layer.ts Outdated

fix: allocate batch state per execution
9aece2f

Uh oh!

Conversation

7ttp commented Aug 27, 2026

TL;DR

what's biting?

now fixed by:

ref:

Uh oh!

chatgpt-codex-connectorBot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actionsBot commented Aug 27, 2026• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Supabase CLI preview

Uh oh!

chatgpt-codex-connectorBot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

chatgpt-codex-connectorBot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

chatgpt-codex-connectorBot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

chatgpt-codex-connectorBot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

chatgpt-codex-connectorBot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connectorBotAug 27, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

7ttp commented Aug 27, 2026

Uh oh!

chatgpt-codex-connectorBot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

github-actionsBot commented Aug 27, 2026•
edited
Loading