Skip to content

[SPARK-56472][SQL] Fix MERGE schema evolution with WHEN MATCHED THEN DELETE #55340

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

Closed
johanl-db wants to merge 2 commits into from
+21 −0
Closed

[SPARK-56472][SQL] Fix MERGE schema evolution with WHEN MATCHED THEN DELETE #55340

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
fe6cf8a
Fix MERGE schema evolution with WHEN MATCHED THEN DELETE
johanl-db Apr 14, 2026
6abf863
Add test for single DELETE clause only
johanl-db Apr 15, 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
1 change: 1 addition & 0 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/v2Commands.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1061,6 +1061,7 @@ case class MergeIntoTable(
actions.forall {
case a: UpdateAction => MergeIntoTable.areSchemaEvolutionReady(a.assignments, sourceTable)
case a: InsertAction => MergeIntoTable.areSchemaEvolutionReady(a.assignments, sourceTable)
case _: DeleteAction => true
case _ => false
}
}
Expand Down
20 changes: 20 additions & 0 deletions ...re/src/test/scala/org/apache/spark/sql/connector/MergeIntoSchemaEvolutionBasicTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1245,4 +1245,24 @@ trait MergeIntoSchemaEvolutionBasicTests extends MergeIntoSchemaEvolutionSuiteBa
expectErrorWithoutEvolutionContains = "A column, variable, or function parameter with name " +
"`bonus` cannot be resolved"
)

testEvolution("source has extra column with delete action")(
Comment thread
johanl-db marked this conversation as resolved.
targetData = Seq((1, "hr"), (2, "software")).toDF("pk", "dep"),
sourceData = Seq((2, "dummy", 200), (3, "dummy", 300)).toDF("pk", "dep", "salary"),
clauses = Seq(delete(), insertAll()),
expected = Seq[(Int, String, java.lang.Integer)](
(1, "hr", null),
(3, "dummy", 300)).toDF("pk", "dep", "salary"),
expectedWithoutEvolution = Seq(
(1, "hr"),
(3, "dummy")).toDF("pk", "dep")
)

testEvolution("delete-only action does not trigger schema evolution")(
targetData = Seq((1, "hr"), (2, "software")).toDF("pk", "dep"),
sourceData = Seq((2, "dummy", 200)).toDF("pk", "dep", "salary"),
clauses = Seq(delete()),
expected = Seq((1, "hr")).toDF("pk", "dep"),
expectedWithoutEvolution = Seq((1, "hr")).toDF("pk", "dep")
)
}