=== Applying patches on top of PostgreSQL commit ID 1b2bb5077e9e9deac60a3e92e742465e7bcd3a21 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Dec  3 11:37:21 UTC 2025
On branch cf/5907
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-skip-table-rewrite-when-change-column-type-to-constrained-domain.patch ===
Applying: skip table rewrite when change column type to constrained domain
Using index info to reconstruct a base tree...
M	doc/src/sgml/ref/alter_table.sgml
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
Auto-merging doc/src/sgml/ref/alter_table.sgml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 skip table rewrite when change column type to constrained domain
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".
Unstaged changes after reset:
M	doc/src/sgml/ref/alter_table.sgml
M	src/backend/commands/tablecmds.c
M	src/test/regress/expected/fast_default.out
M	src/test/regress/sql/fast_default.sql
=== using patch(1) to apply patch ./v2-0001-skip-table-rewrite-when-change-column-type-to-constrained-domain.patch ===
patching file doc/src/sgml/ref/alter_table.sgml
Hunk #1 succeeded at 1457 (offset -2 lines).
patching file src/backend/commands/tablecmds.c
Hunk #1 succeeded at 231 (offset 1 line).
Hunk #2 succeeded at 242 (offset 1 line).
Hunk #3 succeeded at 6016 (offset 3 lines).
Hunk #4 succeeded at 6126 (offset 3 lines).
Hunk #5 succeeded at 6146 (offset 3 lines).
Hunk #6 FAILED at 6210.
Hunk #7 succeeded at 6441 (offset 3 lines).
Hunk #8 succeeded at 14569 (offset 28 lines).
Hunk #9 succeeded at 14713 (offset 28 lines).
Hunk #10 succeeded at 14734 (offset 28 lines).
1 out of 10 hunks FAILED -- saving rejects to file src/backend/commands/tablecmds.c.rej
patching file src/test/regress/expected/fast_default.out
patching file src/test/regress/sql/fast_default.sql
Unstaged changes after reset:
M	doc/src/sgml/ref/alter_table.sgml
M	src/backend/commands/tablecmds.c
M	src/test/regress/expected/fast_default.out
M	src/test/regress/sql/fast_default.sql
Removing src/backend/commands/tablecmds.c.rej
=== using 'git apply' to apply patch ./v2-0001-skip-table-rewrite-when-change-column-type-to-constrained-domain.patch ===
Applied patch to 'doc/src/sgml/ref/alter_table.sgml' cleanly.
Applied patch to 'src/backend/commands/tablecmds.c' with conflicts.
Applied patch to 'src/test/regress/expected/fast_default.out' cleanly.
Applied patch to 'src/test/regress/sql/fast_default.sql' cleanly.
U src/backend/commands/tablecmds.c
diff --cc src/backend/commands/tablecmds.c
index 07e5b95782e,82e72b2873d..00000000000
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@@ -6205,7 -6209,12 +6212,16 @@@ ATRewriteTable(AlteredTableInfo *tab, O
  		NewColumnValue *ex = lfirst(l);
  
  		/* expr already planned */
++<<<<<<< ours
 +		ex->exprstate = ExecInitExpr(ex->expr, NULL);
++=======
+ 		ex->exprstate = ExecInitExpr((Expr *) ex->expr, NULL);
+ 		if (ex->scan_only && !tab->rewrite && !scan_only)
+ 		{
+ 			needscan = true;
+ 			scan_only = true;
+ 		}
++>>>>>>> theirs
  	}
  
  	notnull_attrs = notnull_virtual_attrs = NIL;