=== 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. Thu Apr 16 00:53:25 UTC 2026 On branch cf/4460 nothing to commit, working tree clean === using 'git am' to apply patch ./v46-0001-Row-pattern-recognition-patch-for-raw-parser.patch === Applying: Row pattern recognition patch for raw parser. Using index info to reconstruct a base tree... M src/backend/parser/gram.y M src/include/nodes/parsenodes.h M src/include/parser/kwlist.h M src/include/parser/parse_node.h Falling back to patching base and 3-way merge... Auto-merging src/include/parser/parse_node.h Auto-merging src/include/parser/kwlist.h Auto-merging src/include/nodes/parsenodes.h Auto-merging src/backend/parser/gram.y CONFLICT (content): Merge conflict in src/backend/parser/gram.y error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Row pattern recognition patch for raw parser. 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 ./v46-0001-Row-pattern-recognition-patch-for-raw-parser.patch === patching file src/backend/parser/gram.y Hunk #2 succeeded at 720 (offset 2 lines). Hunk #3 succeeded at 771 (offset 2 lines). Hunk #4 succeeded at 787 (offset 2 lines). Hunk #5 FAILED at 810. Hunk #6 succeeded at 824 (offset 2 lines). Hunk #7 succeeded at 907 (offset 2 lines). Hunk #8 FAILED at 936. Hunk #9 succeeded at 17346 (offset 100 lines). Hunk #10 succeeded at 17355 (offset 100 lines). Hunk #11 succeeded at 17368 (offset 100 lines). Hunk #12 succeeded at 17405 (offset 100 lines). Hunk #13 succeeded at 17416 (offset 100 lines). Hunk #14 succeeded at 17427 (offset 100 lines). Hunk #15 succeeded at 17439 (offset 100 lines). Hunk #16 succeeded at 17516 (offset 100 lines). Hunk #17 succeeded at 17527 (offset 100 lines). Hunk #18 succeeded at 17538 (offset 100 lines). Hunk #19 succeeded at 17549 (offset 100 lines). Hunk #20 succeeded at 17560 (offset 100 lines). Hunk #21 succeeded at 17574 (offset 100 lines). Hunk #22 succeeded at 19249 (offset 100 lines). Hunk #23 succeeded at 19318 (offset 100 lines). Hunk #24 succeeded at 19395 (offset 100 lines). Hunk #25 succeeded at 19456 (offset 101 lines). Hunk #26 succeeded at 19846 (offset 101 lines). Hunk #27 succeeded at 19929 (offset 101 lines). Hunk #28 succeeded at 20044 (offset 101 lines). Hunk #29 succeeded at 20110 (offset 102 lines). Hunk #30 succeeded at 21305 (offset 102 lines). 2 out of 30 hunks FAILED -- saving rejects to file src/backend/parser/gram.y.rej patching file src/include/nodes/parsenodes.h Hunk #1 succeeded at 581 (offset 3 lines). Hunk #2 succeeded at 648 (offset 3 lines). Hunk #3 succeeded at 1703 (offset 3 lines). Hunk #4 succeeded at 1737 (offset 3 lines). patching file src/include/parser/kwlist.h Hunk #4 succeeded at 419 (offset 1 line). patching file src/include/parser/parse_node.h Hunk #2 succeeded at 231 (offset 4 lines). Unstaged changes after reset: M src/backend/parser/gram.y M src/include/nodes/parsenodes.h M src/include/parser/kwlist.h M src/include/parser/parse_node.h Removing src/backend/parser/gram.y.rej === using 'git apply' to apply patch ./v46-0001-Row-pattern-recognition-patch-for-raw-parser.patch === Applied patch to 'src/backend/parser/gram.y' with conflicts. Applied patch to 'src/include/nodes/parsenodes.h' cleanly. Applied patch to 'src/include/parser/kwlist.h' cleanly. Applied patch to 'src/include/parser/parse_node.h' cleanly. U src/backend/parser/gram.y diff --cc src/backend/parser/gram.y index 2d1b19d1f53,b4dcd3c38dc..00000000000 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@@ -801,8 -810,8 +812,13 @@@ static RPRPatternNode *makeRPRQuantifie ORDER ORDINALITY OTHERS OUT_P OUTER_P OVER OVERLAPS OVERLAY OVERRIDING OWNED OWNER ++<<<<<<< ours + PARALLEL PARAMETER PARSER PARTIAL PARTITION PARTITIONS PASSING PASSWORD PATH + PERIOD PLACING PLAN PLANS POLICY PORTION ++======= + PARALLEL PARAMETER PARSER PARTIAL PARTITION PARTITIONS PASSING PASSWORD PAST PATH + PATTERN_P PERIOD PLACING PLAN PLANS POLICY ++>>>>>>> theirs POSITION PRECEDING PRECISION PRESERVE PREPARE PREPARED PRIMARY PRIOR PRIVILEGES PROCEDURAL PROCEDURE PROCEDURES PROGRAM PROPERTIES PROPERTY PUBLICATION @@@ -929,7 -935,8 +945,12 @@@ */ %nonassoc UNBOUNDED NESTED /* ideally would have same precedence as IDENT */ %nonassoc IDENT PARTITION RANGE ROWS GROUPS PRECEDING FOLLOWING CUBE ROLLUP ++<<<<<<< ours + SET KEYS OBJECT_P SCALAR TO USING VALUE_P WITH WITHOUT PATH ++======= + SET KEYS OBJECT_P SCALAR VALUE_P WITH WITHOUT PATH + AFTER INITIAL SEEK PATTERN_P ++>>>>>>> theirs %left Op OPERATOR RIGHT_ARROW '|' /* multi-character ops and user-defined operators */ %left '+' '-' %left '*' '/' '%'