=== Applying patches on top of PostgreSQL commit ID 0ab208fa505c04e2b3483de53a73edb71f9b9106 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Fri Nov 7 13:01:26 UTC 2025 On branch cf/4460 nothing to commit, working tree clean === using 'git am' to apply patch ./v33-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 Falling back to patching base and 3-way merge... 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". 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 === using patch(1) to apply patch ./v33-0001-Row-pattern-recognition-patch-for-raw-parser.patch === patching file src/backend/parser/gram.y Hunk #1 succeeded at 827 with fuzz 2 (offset 156 lines). Hunk #2 FAILED at 721. Hunk #3 FAILED at 737. Hunk #4 FAILED at 762. Hunk #5 FAILED at 774. Hunk #6 succeeded at 864 (offset 7 lines). Hunk #7 succeeded at 895 (offset 7 lines). Hunk #8 succeeded at 16577 (offset 106 lines). Hunk #9 succeeded at 16590 (offset 106 lines). Hunk #10 succeeded at 16773 (offset 106 lines). Hunk #11 succeeded at 18047 (offset 108 lines). Hunk #12 succeeded at 18122 (offset 109 lines). Hunk #13 succeeded at 18178 (offset 110 lines). Hunk #14 succeeded at 18402 (offset 111 lines). Hunk #15 succeeded at 18566 (offset 111 lines). Hunk #16 succeeded at 18645 (offset 111 lines). Hunk #17 succeeded at 18758 (offset 112 lines). Hunk #18 succeeded at 18819 (offset 112 lines). 4 out of 18 hunks FAILED -- saving rejects to file src/backend/parser/gram.y.rej patching file src/include/nodes/parsenodes.h Hunk #1 succeeded at 578 (offset 2 lines). Hunk #2 succeeded at 618 (offset 2 lines). Hunk #3 succeeded at 1587 (offset 2 lines). Hunk #4 succeeded at 1621 (offset 2 lines). patching file src/include/parser/kwlist.h Hunk #2 succeeded at 218 (offset 1 line). Hunk #3 succeeded at 343 (offset 2 lines). Hunk #4 succeeded at 408 (offset 3 lines). patching file src/include/parser/parse_node.h 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 ./v33-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 57fe0186547,e9ad9824fe4..00000000000 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@@ -679,6 -671,14 +679,17 @@@ static Node *makeRecursiveViewSelect(ch json_object_constructor_null_clause_opt json_array_constructor_null_clause_opt ++<<<<<<< ours ++======= + %type row_pattern_definition + %type opt_row_pattern_common_syntax + row_pattern_term + %type row_pattern_definition_list + row_pattern + %type opt_row_pattern_skip_to + %type opt_row_pattern_initial_or_seek + ++>>>>>>> theirs /* * Non-keyword token types. These are hard-wired into the "flex" lexer. * They must be listed first so that their numeric codes do not depend on @@@ -736,8 -736,8 +747,13 @@@ HANDLER HAVING HEADER_P HOLD HOUR_P ++<<<<<<< ours + IDENTITY_P IF_P IGNORE_P ILIKE IMMEDIATE IMMUTABLE IMPLICIT_P IMPORT_P IN_P INCLUDE + INCLUDING INCREMENT INDENT INDEX INDEXES INHERIT INHERITS INITIALLY INLINE_P ++======= + IDENTITY_P IF_P ILIKE IMMEDIATE IMMUTABLE IMPLICIT_P IMPORT_P IN_P INCLUDE + INCLUDING INCREMENT INDENT INDEX INDEXES INHERIT INHERITS INITIAL INITIALLY INLINE_P ++>>>>>>> theirs INNER_P INOUT INPUT_P INSENSITIVE INSERT INSTEAD INT_P INTEGER INTERSECT INTERVAL INTO INVOKER IS ISNULL ISOLATION @@@ -771,10 -771,10 +787,10 @@@ RANGE READ REAL REASSIGN RECURSIVE REF_P REFERENCES REFERENCING REFRESH REINDEX RELATIVE_P RELEASE RENAME REPEATABLE REPLACE REPLICA - RESET RESTART RESTRICT RETURN RETURNING RETURNS REVOKE RIGHT ROLE ROLLBACK ROLLUP + RESET RESPECT_P RESTART RESTRICT RETURN RETURNING RETURNS REVOKE RIGHT ROLE ROLLBACK ROLLUP ROUTINE ROUTINES ROW ROWS RULE - SAVEPOINT SCALAR SCHEMA SCHEMAS SCROLL SEARCH SECOND_P SECURITY SELECT + SAVEPOINT SCALAR SCHEMA SCHEMAS SCROLL SEARCH SECOND_P SECURITY SEEK SELECT SEQUENCE SEQUENCES SERIALIZABLE SERVER SESSION SESSION_USER SET SETS SETOF SHARE SHOW SIMILAR SIMPLE SKIP SMALLINT SNAPSHOT SOME SOURCE SQL_P STABLE STANDALONE_P