Skip to content

Fix redundant change stream SET FOR on FOR scope transitions #82

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

Merged
daichirata merged 1 commit into from
Feb 15, 2026
Merged

Fix redundant change stream SET FOR on FOR scope transitions #82

Show file tree
Hide file tree
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
13 changes: 7 additions & 6 deletions internal/hammer/diff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,10 +512,10 @@ func (g *Generator) generateDDLForDropConstraintIndexAndTable(table *Table) DDL
break
}
}
// change stream が g.to に存在する場合のみ ALTER 処理を行う
// 存在しない場合（削除される場合）は DROP 処理に進む
// Only run ALTER when the change stream exists in g.to.
// If it does not exist in g.to (i.e. it will be dropped), continue to DROP logic.
if len(remainingTables) > 0 && hasRemainingTableInTarget {
if _, csExistsInTarget := g.findChangeStreamByName(g.to, identsToComparable(cs.Name)); csExistsInTarget {
if toCS, csExistsInTarget := g.findChangeStreamByName(g.to, identsToComparable(cs.Name)); csExistsInTarget {
alteredCS := &ChangeStream{
CreateChangeStream: &ast.CreateChangeStream{
Name: cs.Name,
Expand All @@ -525,9 +525,10 @@ func (g *Generator) generateDDLForDropConstraintIndexAndTable(table *Table) DDL
}
g.alteredChangeStreamStates[identsToComparable(cs.Name)] = alteredCS

// willCreateOrAlterChangeStreamIDs に登録されている場合は
// ALTER文を出力しない（GenerateDDL で処理される）
if _, willAlter := g.willCreateOrAlterChangeStreamIDs[identsToComparable(cs.Name)]; !willAlter {
// Do not emit ALTER here when it is already handled in GenerateDDL
// via willCreateOrAlterChangeStreamIDs.
// Also emit intermediate SET FOR only when the final target is FOR TABLES.
if _, willAlter := g.willCreateOrAlterChangeStreamIDs[identsToComparable(cs.Name)]; !willAlter && toCS.Type() == ChangeStreamTypeTables {
ddl.Append(&ast.AlterChangeStream{
Name: cs.Name,
ChangeStreamAlteration: &ast.ChangeStreamSetFor{
Expand Down
46 changes: 46 additions & 0 deletions internal/hammer/diff_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2543,6 +2543,52 @@ CREATE CHANGE STREAM CS1 FOR ALL;
"DROP TABLE t1",
},
},
{
name: "change stream from multi-table to FOR ALL with table drop",
from: `
CREATE TABLE t1 (
id INT64 NOT NULL,
) PRIMARY KEY(id);
CREATE TABLE t2 (
id INT64 NOT NULL,
) PRIMARY KEY(id);
CREATE CHANGE STREAM CS1 FOR t1, t2;
`,
to: `
CREATE TABLE t2 (
id INT64 NOT NULL,
) PRIMARY KEY(id);
CREATE CHANGE STREAM CS1 FOR ALL;
`,
ignoreAlterDatabase: true,
expected: []string{
"ALTER CHANGE STREAM CS1 SET FOR ALL",
"DROP TABLE t1",
},
},
{
name: "change stream from multi-table to none with table drop",
from: `
CREATE TABLE t1 (
id INT64 NOT NULL,
) PRIMARY KEY(id);
CREATE TABLE t2 (
id INT64 NOT NULL,
) PRIMARY KEY(id);
CREATE CHANGE STREAM CS1 FOR t1, t2;
`,
to: `
CREATE TABLE t2 (
id INT64 NOT NULL,
) PRIMARY KEY(id);
CREATE CHANGE STREAM CS1;
`,
ignoreAlterDatabase: true,
expected: []string{
"ALTER CHANGE STREAM CS1 DROP FOR ALL",
"DROP TABLE t1",
},
},
{
name: "multiple change streams watching same table",
from: `
Expand Down