=== Applying patches on top of PostgreSQL commit ID 972c14fb9134fdfd76ea6ebcf98a55a945bbc988 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Apr 15 05:19:24 UTC 2026 On branch cf/5782 nothing to commit, working tree clean === using 'git am' to apply patch ./v1-0001-rename-ExecComputeStoredGenerated-to-ExecComputeGenerated.patch === Applying: rename ExecComputeStoredGenerated to ExecComputeGenerated === using 'git am' to apply patch ./v1-0002-foreign-key-on-virtual-generated-column.patch === Applying: foreign key on virtual generated column error: sha1 information is lacking or useless (src/backend/commands/copyfrom.c). error: could not build fake ancestor hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 foreign key on virtual generated column When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". === using patch(1) to apply patch ./v1-0002-foreign-key-on-virtual-generated-column.patch === patching file src/backend/commands/copyfrom.c Hunk #1 succeeded at 1349 (offset 2 lines). patching file src/backend/commands/tablecmds.c Hunk #1 succeeded at 675 (offset 16 lines). Hunk #2 FAILED at 8642. Hunk #3 succeeded at 10334 (offset 112 lines). Hunk #4 succeeded at 15986 (offset 334 lines). Hunk #5 succeeded at 16143 (offset 334 lines). Hunk #6 succeeded at 16168 (offset 334 lines). 1 out of 6 hunks FAILED -- saving rejects to file src/backend/commands/tablecmds.c.rej patching file src/backend/executor/execReplication.c Hunk #1 succeeded at 836 (offset 248 lines). Hunk #2 succeeded at 941 (offset 255 lines). patching file src/backend/executor/execUtils.c Hunk #1 succeeded at 1430 (offset 26 lines). patching file src/backend/executor/nodeModifyTable.c Hunk #1 succeeded at 436 (offset 21 lines). Hunk #2 succeeded at 450 (offset 21 lines). Hunk #3 succeeded at 495 (offset 21 lines). Hunk #4 succeeded at 525 (offset 21 lines). Hunk #5 succeeded at 571 (offset 21 lines). Hunk #6 succeeded at 589 (offset 21 lines). Hunk #7 succeeded at 600 (offset 21 lines). Hunk #8 succeeded at 608 (offset 21 lines). Hunk #9 succeeded at 631 (offset 21 lines). Hunk #10 succeeded at 969 (offset 21 lines). Hunk #11 succeeded at 1095 (offset 19 lines). Hunk #12 succeeded at 2442 (offset 277 lines). patching file src/backend/utils/adt/ri_triggers.c Hunk #1 succeeded at 37 with fuzz 1 (offset 4 lines). Hunk #2 succeeded at 386 with fuzz 2 (offset 101 lines). Hunk #3 succeeded at 1603 (offset 131 lines). Hunk #4 succeeded at 1614 (offset 131 lines). Hunk #5 succeeded at 1725 (offset 131 lines). patching file src/include/executor/nodeModifyTable.h patching file src/test/regress/expected/generated_virtual.out Hunk #1 succeeded at 791 (offset 24 lines). patching file src/test/regress/sql/generated_virtual.sql Hunk #1 succeeded at 429 (offset 10 lines). Unstaged changes after reset: M src/backend/commands/copyfrom.c M src/backend/commands/tablecmds.c M src/backend/executor/execReplication.c M src/backend/executor/execUtils.c M src/backend/executor/nodeModifyTable.c M src/backend/utils/adt/ri_triggers.c M src/include/executor/nodeModifyTable.h M src/test/regress/expected/generated_virtual.out M src/test/regress/sql/generated_virtual.sql Removing src/backend/commands/tablecmds.c.rej === using 'git apply' to apply patch ./v1-0002-foreign-key-on-virtual-generated-column.patch === error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... Applied patch to 'src/backend/commands/tablecmds.c' with conflicts. error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... Applied patch to 'src/backend/executor/execUtils.c' cleanly. error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... Applied patch to 'src/backend/utils/adt/ri_triggers.c' cleanly. error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... Applied patch to 'src/test/regress/expected/generated_virtual.out' cleanly. Applied patch to 'src/test/regress/sql/generated_virtual.sql' cleanly. U src/backend/commands/tablecmds.c diff --cc src/backend/commands/tablecmds.c index eec09ba1ded,252776c0005..00000000000 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@@ -8754,16 -8642,17 +8754,29 @@@ ATExecSetExpression(AlteredTableInfo *t * this renders them pointless. */ RelationClearMissing(rel); + } ++<<<<<<< ours + /* make sure we don't conflict with later attribute modifications */ + CommandCounterIncrement(); + } ++======= + /* make sure we don't conflict with later attribute modifications */ + CommandCounterIncrement(); + + /* + * Find everything that depends on the column (constraints, indexes, + * etc), and record enough information to let us recreate the objects + * after rewrite. + */ + RememberAllDependentForRebuilding(tab, AT_SetExpression, rel, attnum, colName); ++>>>>>>> theirs + + /* + * Find everything that depends on the column (constraints, indexes, etc), + * and record enough information to let us recreate the objects. + */ + RememberAllDependentForRebuilding(tab, AT_SetExpression, rel, attnum, colName); /* * Drop the dependency records of the GENERATED expression, in particular