=== Applying patches on top of PostgreSQL commit ID 25303961d09c7e2354a48cbce511a06cce691907 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Dec  6 19:24:23 UTC 2025
On branch cf/5943
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-Fix-the-operation-order-in-get_relation_constrain.patch ===
Applying: Fix the operation order in get_relation_constraints()
Using index info to reconstruct a base tree...
M	src/backend/optimizer/util/plancat.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/optimizer/util/plancat.c
CONFLICT (content): Merge conflict in src/backend/optimizer/util/plancat.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix the operation order in get_relation_constraints()
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	src/backend/optimizer/util/plancat.c
=== using patch(1) to apply patch ./v2-0001-Fix-the-operation-order-in-get_relation_constrain.patch ===
patching file src/backend/optimizer/util/plancat.c
Hunk #1 succeeded at 1497 with fuzz 2 (offset 91 lines).
Hunk #2 FAILED at 1428.
1 out of 2 hunks FAILED -- saving rejects to file src/backend/optimizer/util/plancat.c.rej
Unstaged changes after reset:
M	src/backend/optimizer/util/plancat.c
Removing src/backend/optimizer/util/plancat.c.rej
=== using 'git apply' to apply patch ./v2-0001-Fix-the-operation-order-in-get_relation_constrain.patch ===
Applied patch to 'src/backend/optimizer/util/plancat.c' with conflicts.
U src/backend/optimizer/util/plancat.c
diff --cc src/backend/optimizer/util/plancat.c
index 07f92fac239,73fd57a316b..00000000000
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@@ -1519,9 -1407,9 +1519,15 @@@ get_relation_constraints(PlannerInfo *r
  			cexpr = stringToNode(constr->check[i].ccbin);
  
  			/*
++<<<<<<< ours
 +			 * Fix Vars to have the desired varno.  This must be done before
 +			 * const-simplification because eval_const_expressions reduces
 +			 * NullTest for Vars based on varno.
++=======
+ 			 * Fix Vars to have the desired varno.  Must do this before
+ 			 * eval_const_expressions(), which might access the corresponding
+ 			 * RTEs.
++>>>>>>> theirs
  			 */
  			if (varno != 1)
  				ChangeVarNodes(cexpr, 1, varno, 0);