Fix ALTER TABLE DROP EXPRESSION with inheritance hierarchy
1 patchset tracked - current t52152_6
v6t52152_6posted Oct 22, 2025tests failedwon't retrystale 47dpg 20
basedd62a7101 Aug 03, 16:25 on master
applyapplied Aug 03, 18:28
rebaselast tried Sep 02, 03:41 on a9eebaf37
Applying: Fix ALTER TABLE DROP EXPRESSION for inheritance hierarchy
Using index info to reconstruct a base tree...
M src/backend/commands/tablecmds.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/commands/tablecmds.c
CONFLICT (content): Merge conflict in src/backend/commands/tablecmds.c
Patch failed at 0001 Fix ALTER TABLE DROP EXPRESSION for inheritance hierarchy
/ci/repo/worktrees/worktree/rebase-apply/patch:20: indent with spaces.
find_inheritance_children(RelationGetRelid(rel), lockmode))
/ci/repo/worktrees/worktree/rebase-apply/patch:21: indent with spaces.
ereport(ERROR,
/ci/repo/worktrees/worktree/rebase-apply/patch:22: indent with spaces.
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
/ci/repo/worktrees/worktree/rebase-apply/patch:23: indent with spaces.
errmsg("ALTER TABLE / DROP EXPRESSION must be applied to child tables too"),
/ci/repo/worktrees/worktree/rebase-apply/patch:24: indent with spaces.
errhint("Do not specify the ONLY keyword.")));
warning: 5 lines add whitespace errors.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
conflicts on master: src/backend/commands/tablecmds.c
pushAug 03, 18:28 -> 0c39e6cdabranchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| tests failed | 1 | 20 | 935 / 941 | 2m 12s / 4m 36s | docker run ... :t52152 | Aug 03, 18:37 |
run 30841423930failed: regress/generated_stored, regress/generated_virtual, test_plan_advice/001_replan_regress, pg_upgrade/002_pg_upgrade, recovery/027_stream_regress, pgbench/001_pgbench_with_server executed 941 - ccache 166 hit / 6452 miss - head 0c39e6cda - digest sha256:dfd05bc17dbc0b... - run 30841423930 | ||||||
| tests failed | 1 | 20 | 927 / 932 | 2m 47s / 5m 10s | docker run ... @sha256:cc64c64... | Aug 02, 18:38 |
run 30761151614failed: regress/generated_stored, regress/generated_virtual, test_plan_advice/001_replan_regress, pg_upgrade/002_pg_upgrade, recovery/027_stream_regress executed 932 - ccache 166 hit / 6452 miss - head 4453afeca - digest sha256:cc64c64f6b6eb6... - run 30761151614 | ||||||
| tests failed | 1 | 20 | 927 / 932 | 2m 49s / 4m 41s | docker run ... @sha256:4875961... | Aug 01, 18:36 |
run 30712525733failed: regress/generated_stored, regress/generated_virtual, test_plan_advice/001_replan_regress, pg_upgrade/002_pg_upgrade, recovery/027_stream_regress executed 932 - ccache 166 hit / 6452 miss - head 47d272a02 - digest sha256:48759614b3304b... - run 30712525733 | ||||||
| tests failed | 1 | 20 | 927 / 932 | 2m 55s / 5m 22s | docker run ... @sha256:182cb15... | Jul 31, 18:37 |
run 30655021253failed: regress/generated_stored, regress/generated_virtual, test_plan_advice/001_replan_regress, pg_upgrade/002_pg_upgrade, recovery/027_stream_regress executed 932 - ccache 166 hit / 6452 miss - head eb80ff505 - digest sha256:182cb15cd34bfd... - run 30655021253 | ||||||
| tests failed | 1 | 20 | 927 / 932 | 2m 47s / 5m 07s | docker run ... @sha256:d52b6a2... | Jul 30, 18:33 |
run 30570146633failed: regress/generated_stored, regress/generated_virtual, test_plan_advice/001_replan_regress, pg_upgrade/002_pg_upgrade, recovery/027_stream_regress executed 932 - ccache 166 hit / 6452 miss - head 23b99e2ee - digest sha256:d52b6a21541a75... - run 30570146633 | ||||||
| tests failed | 1 | 20 | 936 / 941 | 2m 33s / 4m 21s | docker run ... @sha256:1b28091... | Jul 29, 18:31 |
run 30479558434failed: regress/generated_stored, regress/generated_virtual, test_plan_advice/001_replan_regress, pg_upgrade/002_pg_upgrade, recovery/027_stream_regress executed 941 - ccache 166 hit / 6452 miss - head 49dbd0dcb - digest sha256:1b280912097837... - run 30479558434 | ||||||
| tests failed | 1 | 20 | 934 / 939 | 2m 49s / 5m 04s | docker run ... @sha256:2df380f... | Jul 28, 18:32 |
run 30387038133failed: regress/generated_stored, regress/generated_virtual, test_plan_advice/001_replan_regress, pg_upgrade/002_pg_upgrade, recovery/027_stream_regress executed 939 - ccache 166 hit / 6452 miss - head 31a7bd323 - digest sha256:2df380fd735a73... - run 30387038133 | ||||||
| tests failed | 1 | 20 | 933 / 938 | 2m 49s / 5m 10s | docker run ... @sha256:0349b54... | Jul 27, 07:02 |
run 30244108453failed: regress/generated_stored, regress/generated_virtual, test_plan_advice/001_replan_regress, pg_upgrade/002_pg_upgrade, recovery/027_stream_regress executed 938 - ccache 166 hit / 6452 miss - head 867a71cf4 - digest sha256:0349b54c6e25f4... - run 30244108453 | ||||||