=== Applying patches on top of PostgreSQL commit ID 792094a5ce89f9953d913c835e4530e56b63026a === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Sep 2 21:08:25 UTC 2026 On branch cf/7144 nothing to commit, working tree clean === using 'git am' to apply patch ./v8-0001-Rework-GRAPH_TABLE-aggregate-window-SRF-rejection.patch === Applying: Rework GRAPH_TABLE aggregate/window/SRF rejection using ParseExprKind. Using index info to reconstruct a base tree... M src/backend/parser/parse_graphtable.c M src/test/regress/expected/graph_table.out M src/test/regress/sql/graph_table.sql Falling back to patching base and 3-way merge... Auto-merging src/test/regress/sql/graph_table.sql Auto-merging src/test/regress/expected/graph_table.out Auto-merging src/backend/parser/parse_graphtable.c CONFLICT (content): Merge conflict in src/backend/parser/parse_graphtable.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 Rework GRAPH_TABLE aggregate/window/SRF rejection using ParseExprKind. 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 ./v8-0001-Rework-GRAPH_TABLE-aggregate-window-SRF-rejection.patch === patching file src/backend/optimizer/util/var.c patching file src/backend/parser/parse_agg.c patching file src/backend/parser/parse_clause.c patching file src/backend/parser/parse_expr.c patching file src/backend/parser/parse_func.c patching file src/backend/parser/parse_graphtable.c Hunk #1 succeeded at 93 (offset 1 line). Hunk #2 succeeded at 107 (offset 1 line). Hunk #3 succeeded at 137 (offset 1 line). Hunk #4 FAILED at 251. Hunk #5 FAILED at 388. 2 out of 5 hunks FAILED -- saving rejects to file src/backend/parser/parse_graphtable.c.rej patching file src/backend/rewrite/rewriteGraphTable.c patching file src/backend/rewrite/rewriteManip.c patching file src/include/nodes/primnodes.h patching file src/include/parser/parse_node.h patching file src/test/regress/expected/graph_table.out Hunk #1 succeeded at 475 (offset 4 lines). Hunk #2 succeeded at 1181 (offset 4 lines). patching file src/test/regress/sql/graph_table.sql Hunk #1 succeeded at 308 (offset 2 lines). Unstaged changes after reset: M src/backend/optimizer/util/var.c M src/backend/parser/parse_agg.c M src/backend/parser/parse_clause.c M src/backend/parser/parse_expr.c M src/backend/parser/parse_func.c M src/backend/parser/parse_graphtable.c M src/backend/rewrite/rewriteGraphTable.c M src/backend/rewrite/rewriteManip.c M src/include/nodes/primnodes.h M src/include/parser/parse_node.h M src/test/regress/expected/graph_table.out M src/test/regress/sql/graph_table.sql Removing src/backend/parser/parse_graphtable.c.rej === using 'git apply' to apply patch ./v8-0001-Rework-GRAPH_TABLE-aggregate-window-SRF-rejection.patch === Applied patch to 'src/backend/optimizer/util/var.c' cleanly. Applied patch to 'src/backend/parser/parse_agg.c' cleanly. Applied patch to 'src/backend/parser/parse_clause.c' cleanly. Applied patch to 'src/backend/parser/parse_expr.c' cleanly. Applied patch to 'src/backend/parser/parse_func.c' cleanly. Applied patch to 'src/backend/parser/parse_graphtable.c' with conflicts. Applied patch to 'src/backend/rewrite/rewriteGraphTable.c' cleanly. Applied patch to 'src/backend/rewrite/rewriteManip.c' cleanly. Applied patch to 'src/include/nodes/primnodes.h' cleanly. Applied patch to 'src/include/parser/parse_node.h' cleanly. Applied patch to 'src/test/regress/expected/graph_table.out' cleanly. Applied patch to 'src/test/regress/sql/graph_table.sql' cleanly. U src/backend/parser/parse_graphtable.c diff --cc src/backend/parser/parse_graphtable.c index b44f7ccd0a7,3245878fa9e..00000000000 --- a/src/backend/parser/parse_graphtable.c +++ b/src/backend/parser/parse_graphtable.c @@@ -251,9 -251,7 +252,13 @@@ transformGraphElementPattern(ParseStat gpstate->cur_gep = gep; gep->labelexpr = transformLabelExpr(gpstate, gep->labelexpr); ++<<<<<<< ours + + gep->whereClause = transformWhereClause(pstate, gep->whereClause, + EXPR_KIND_WHERE, "WHERE"); ++======= + gep->whereClause = transformExpr(pstate, gep->whereClause, EXPR_KIND_GRAPH_TABLE_WHERE); ++>>>>>>> theirs /* * Assign collations here for the reason mentioned in the prologue of @@@ -389,8 -387,7 +394,12 @@@ transformGraphPattern(ParseState *pstat transformPathPatternList(pstate, graph_pattern->path_pattern_list)); graph_pattern->path_pattern_list = path_pattern_list; ++<<<<<<< ours + graph_pattern->whereClause = transformWhereClause(pstate, graph_pattern->whereClause, + EXPR_KIND_WHERE, "WHERE"); ++======= + graph_pattern->whereClause = transformExpr(pstate, graph_pattern->whereClause, EXPR_KIND_GRAPH_TABLE_WHERE); ++>>>>>>> theirs assign_expr_collations(pstate, graph_pattern->whereClause); return (Node *) graph_pattern;