=== Applying patches on top of PostgreSQL commit ID 5142f0093e648d1a32fdcc7c835d17fa103e1239 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Mon Apr 20 03:56:22 UTC 2026 On branch cf/5957 nothing to commit, working tree clean === using 'git am' to apply patch ./v7-0001-CAST-expr-AS-type-FORMAT-template.patch === Applying: CAST(expr AS type FORMAT 'template') Using index info to reconstruct a base tree... M src/backend/nodes/nodeFuncs.c M src/backend/parser/gram.y M src/backend/parser/parse_agg.c M src/backend/parser/parse_expr.c M src/backend/parser/parse_func.c M src/backend/parser/parse_utilcmd.c M src/backend/utils/adt/ruleutils.c M src/include/nodes/parsenodes.h M src/include/parser/parse_node.h M src/test/regress/parallel_schedule Falling back to patching base and 3-way merge... Auto-merging src/test/regress/parallel_schedule Auto-merging src/include/parser/parse_node.h Auto-merging src/include/nodes/parsenodes.h Auto-merging src/backend/utils/adt/ruleutils.c Auto-merging src/backend/parser/parse_utilcmd.c Auto-merging src/backend/parser/parse_func.c CONFLICT (content): Merge conflict in src/backend/parser/parse_func.c Auto-merging src/backend/parser/parse_expr.c CONFLICT (content): Merge conflict in src/backend/parser/parse_expr.c Auto-merging src/backend/parser/parse_agg.c CONFLICT (content): Merge conflict in src/backend/parser/parse_agg.c Auto-merging src/backend/parser/gram.y Auto-merging src/backend/nodes/nodeFuncs.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 CAST(expr AS type FORMAT 'template') 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 ./v7-0001-CAST-expr-AS-type-FORMAT-template.patch === patching file src/backend/nodes/nodeFuncs.c Hunk #1 succeeded at 4535 (offset 33 lines). patching file src/backend/parser/gram.y Hunk #2 succeeded at 16790 (offset 100 lines). Hunk #3 succeeded at 19948 (offset 102 lines). patching file src/backend/parser/parse_agg.c Hunk #1 succeeded at 600 (offset 7 lines). Hunk #2 succeeded at 1053 with fuzz 2 (offset 10 lines). patching file src/backend/parser/parse_coerce.c patching file src/backend/parser/parse_expr.c Hunk #2 succeeded at 1893 with fuzz 2 (offset 12 lines). Hunk #3 succeeded at 2742 (offset 12 lines). Hunk #4 succeeded at 2764 (offset 12 lines). Hunk #5 succeeded at 2797 (offset 12 lines). Hunk #6 succeeded at 2808 (offset 12 lines). Hunk #7 FAILED at 3255. 1 out of 7 hunks FAILED -- saving rejects to file src/backend/parser/parse_expr.c.rej patching file src/backend/parser/parse_func.c Hunk #1 succeeded at 2789 with fuzz 2 (offset 3 lines). patching file src/backend/parser/parse_utilcmd.c Hunk #1 succeeded at 680 (offset -6 lines). patching file src/backend/utils/adt/ruleutils.c Hunk #1 succeeded at 11980 (offset 8 lines). patching file src/include/nodes/parsenodes.h Hunk #1 succeeded at 400 (offset 3 lines). patching file src/include/parser/parse_coerce.h patching file src/include/parser/parse_node.h Hunk #1 succeeded at 84 (offset 1 line). patching file src/test/regress/expected/cast.out patching file src/test/regress/expected/collate.linux.utf8.out patching file src/test/regress/expected/horology.out patching file src/test/regress/expected/interval.out patching file src/test/regress/expected/numeric.out patching file src/test/regress/parallel_schedule patching file src/test/regress/sql/cast.sql patching file src/test/regress/sql/collate.linux.utf8.sql patching file src/test/regress/sql/horology.sql patching file src/test/regress/sql/interval.sql patching file src/test/regress/sql/numeric.sql Unstaged changes after reset: M src/backend/nodes/nodeFuncs.c M src/backend/parser/gram.y M src/backend/parser/parse_agg.c M src/backend/parser/parse_coerce.c M src/backend/parser/parse_expr.c M src/backend/parser/parse_func.c M src/backend/parser/parse_utilcmd.c M src/backend/utils/adt/ruleutils.c M src/include/nodes/parsenodes.h M src/include/parser/parse_coerce.h M src/include/parser/parse_node.h M src/test/regress/expected/collate.linux.utf8.out M src/test/regress/expected/horology.out M src/test/regress/expected/interval.out M src/test/regress/expected/numeric.out M src/test/regress/parallel_schedule M src/test/regress/sql/collate.linux.utf8.sql M src/test/regress/sql/horology.sql M src/test/regress/sql/interval.sql M src/test/regress/sql/numeric.sql Removing src/backend/parser/parse_expr.c.rej Removing src/test/regress/expected/cast.out Removing src/test/regress/sql/cast.sql === using 'git apply' to apply patch ./v7-0001-CAST-expr-AS-type-FORMAT-template.patch === Applied patch to 'src/backend/nodes/nodeFuncs.c' cleanly. Applied patch to 'src/backend/parser/gram.y' cleanly. Applied patch to 'src/backend/parser/parse_agg.c' with conflicts. Applied patch to 'src/backend/parser/parse_coerce.c' cleanly. Applied patch to 'src/backend/parser/parse_expr.c' with conflicts. Applied patch to 'src/backend/parser/parse_func.c' with conflicts. Applied patch to 'src/backend/parser/parse_utilcmd.c' cleanly. Applied patch to 'src/backend/utils/adt/ruleutils.c' cleanly. Applied patch to 'src/include/nodes/parsenodes.h' cleanly. Applied patch to 'src/include/parser/parse_coerce.h' cleanly. Applied patch to 'src/include/parser/parse_node.h' cleanly. Falling back to direct application... Applied patch to 'src/test/regress/expected/collate.linux.utf8.out' cleanly. Applied patch to 'src/test/regress/expected/horology.out' cleanly. Applied patch to 'src/test/regress/expected/interval.out' cleanly. Applied patch to 'src/test/regress/expected/numeric.out' cleanly. Applied patch to 'src/test/regress/parallel_schedule' cleanly. Falling back to direct application... Applied patch to 'src/test/regress/sql/collate.linux.utf8.sql' cleanly. Applied patch to 'src/test/regress/sql/horology.sql' cleanly. Applied patch to 'src/test/regress/sql/interval.sql' cleanly. Applied patch to 'src/test/regress/sql/numeric.sql' cleanly. U src/backend/parser/parse_agg.c U src/backend/parser/parse_expr.c U src/backend/parser/parse_func.c diff --cc src/backend/parser/parse_agg.c index acb933392de,5beec4b4518..00000000000 --- a/src/backend/parser/parse_agg.c +++ b/src/backend/parser/parse_agg.c @@@ -1042,8 -1043,8 +1050,13 @@@ transformWindowFuncCall(ParseState *pst case EXPR_KIND_PROPGRAPH_PROPERTY: err = _("window functions are not allowed in property definition expressions"); break; ++<<<<<<< ours + case EXPR_KIND_FOR_PORTION: + err = _("window functions are not allowed in FOR PORTION OF expressions"); ++======= + case EXPR_KIND_TYPECAST_FORMAT: + err = _("window functions are not allowed in CAST FORMAT expressions"); ++>>>>>>> theirs break; /* diff --cc src/backend/parser/parse_expr.c index f535f3b9351,9156f149343..00000000000 --- a/src/backend/parser/parse_expr.c +++ b/src/backend/parser/parse_expr.c @@@ -1889,8 -1881,8 +1890,13 @@@ transformSubLink(ParseState *pstate, Su case EXPR_KIND_PROPGRAPH_PROPERTY: err = _("cannot use subquery in property definition expression"); break; ++<<<<<<< ours + case EXPR_KIND_FOR_PORTION: + err = _("cannot use subquery in FOR PORTION OF expression"); ++======= + case EXPR_KIND_TYPECAST_FORMAT: + err = _("cannot use subquery in CAST FORMAT expression"); ++>>>>>>> theirs break; /* @@@ -3253,8 -3255,8 +3269,13 @@@ ParseExprKindName(ParseExprKind exprKin return "CYCLE"; case EXPR_KIND_PROPGRAPH_PROPERTY: return "property definition expression"; ++<<<<<<< ours + case EXPR_KIND_FOR_PORTION: + return "FOR PORTION OF"; ++======= + case EXPR_KIND_TYPECAST_FORMAT: + return "CAST FORMAT expression"; ++>>>>>>> theirs /* * There is intentionally no default: case here, so that the diff --cc src/backend/parser/parse_func.c index 35ff6427147,614ab69b239..00000000000 --- a/src/backend/parser/parse_func.c +++ b/src/backend/parser/parse_func.c @@@ -2786,8 -2786,8 +2786,13 @@@ check_srf_call_placement(ParseState *ps case EXPR_KIND_PROPGRAPH_PROPERTY: err = _("set-returning functions are not allowed in property definition expressions"); break; ++<<<<<<< ours + case EXPR_KIND_FOR_PORTION: + err = _("set-returning functions are not allowed in FOR PORTION OF expressions"); ++======= + case EXPR_KIND_TYPECAST_FORMAT: + err = _("set-returning functions are not allowed in CAST FORMAT expressions"); ++>>>>>>> theirs break; /*