=== Applying patches on top of PostgreSQL commit ID 2fc31079624e16d6b1a8508958dbf81e8edce057 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Nov 5 03:31:24 UTC 2025 === expanding ./sql_pgq_one_patch_20250807.zip Archive: ./sql_pgq_one_patch_20250807.zip extracting: sql_pgq_one_patch_20250807.diff === expanding ./SQL_PGQ_20250807.zip Archive: ./SQL_PGQ_20250807.zip creating: 20250807/ extracting: 20250807/0001-WIP-SQL-Property-Graph-Queries-SQL-PGQ-20250807.patch extracting: 20250807/0002-Support-some-more-GRAPH_TABLE-constructs-20250807.patch extracting: 20250807/0003-Access-permissions-on-property-graph-20250807.patch extracting: 20250807/0004-Property-collation-and-edge-vertex-link-sup-20250807.patch extracting: 20250807/0005-A-bunch-of-small-fixes-20250807.patch extracting: 20250807/0006-Handle-RTE_GRAPH_TABLE-in-more-places-20250807.patch extracting: 20250807/0007-Property-graphs-in-pg_overexplain-20250807.patch extracting: 20250807/0008-Document-fixes-20250807.patch extracting: 20250807/0009-d-variants-for-property-graphs-20250807.patch extracting: 20250807/0010-getObjectIdentityParts-for-property-graph-e-20250807.patch extracting: 20250807/0011-Prepared-statements-and-property-graph-tabl-20250807.patch extracting: 20250807/0012-Test-interaction-of-RLS-and-property-graph-20250807.patch extracting: 20250807/0013-Test-RLS-and-property-graphs-with-other-fea-20250807.patch On branch cf/4904 nothing to commit, working tree clean === using 'git am' to apply patch ./20250807/0001-WIP-SQL-Property-Graph-Queries-SQL-PGQ-20250807.patch === Applying: WIP: SQL Property Graph Queries (SQL/PGQ) Using index info to reconstruct a base tree... M contrib/pg_overexplain/pg_overexplain.c M doc/src/sgml/catalogs.sgml M doc/src/sgml/func/func-info.sgml M doc/src/sgml/queries.sgml M doc/src/sgml/ref/psql-ref.sgml M doc/src/sgml/ref/select.sgml M src/backend/catalog/aclchk.c M src/backend/catalog/objectaddress.c M src/backend/catalog/sql_features.txt M src/backend/commands/alter.c M src/backend/commands/event_trigger.c M src/backend/commands/tablecmds.c M src/backend/executor/execMain.c M src/backend/nodes/nodeFuncs.c M src/backend/nodes/outfuncs.c M src/backend/nodes/readfuncs.c M src/backend/optimizer/path/allpaths.c M src/backend/optimizer/prep/prepjointree.c M src/backend/parser/analyze.c M src/backend/parser/gram.y 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_relation.c M src/backend/parser/parse_target.c M src/backend/parser/scan.l M src/backend/tcop/utility.c M src/backend/utils/adt/ruleutils.c M src/backend/utils/cache/lsyscache.c M src/bin/pg_dump/common.c M src/bin/pg_dump/pg_backup_archiver.c M src/bin/pg_dump/pg_dump.c M src/bin/pg_dump/t/002_pg_dump.pl M src/bin/psql/command.c M src/bin/psql/describe.c M src/bin/psql/help.c M src/bin/psql/tab-complete.in.c M src/include/catalog/pg_proc.dat M src/include/nodes/parsenodes.h M src/include/nodes/primnodes.h M src/include/parser/kwlist.h M src/include/utils/lsyscache.h M src/test/regress/expected/object_address.out M src/test/regress/parallel_schedule M src/tools/pgindent/typedefs.list Falling back to patching base and 3-way merge... Auto-merging src/tools/pgindent/typedefs.list Auto-merging src/test/regress/parallel_schedule Auto-merging src/test/regress/expected/object_address.out Auto-merging src/include/utils/lsyscache.h Auto-merging src/include/parser/kwlist.h Auto-merging src/include/nodes/primnodes.h Auto-merging src/include/nodes/parsenodes.h Auto-merging src/include/catalog/pg_proc.dat Auto-merging src/bin/psql/tab-complete.in.c Auto-merging src/bin/psql/help.c Auto-merging src/bin/psql/describe.c Auto-merging src/bin/psql/command.c Auto-merging src/bin/pg_dump/t/002_pg_dump.pl Auto-merging src/bin/pg_dump/pg_dump.c Auto-merging src/bin/pg_dump/pg_backup_archiver.c Auto-merging src/bin/pg_dump/common.c Auto-merging src/backend/utils/cache/lsyscache.c Auto-merging src/backend/utils/adt/ruleutils.c Auto-merging src/backend/tcop/utility.c Auto-merging src/backend/parser/scan.l Auto-merging src/backend/parser/parse_target.c Auto-merging src/backend/parser/parse_relation.c Auto-merging src/backend/parser/parse_func.c Auto-merging src/backend/parser/parse_expr.c Auto-merging src/backend/parser/parse_clause.c Auto-merging src/backend/parser/parse_agg.c Auto-merging src/backend/parser/gram.y CONFLICT (content): Merge conflict in src/backend/parser/gram.y Auto-merging src/backend/parser/analyze.c Auto-merging src/backend/optimizer/prep/prepjointree.c Auto-merging src/backend/optimizer/path/allpaths.c Auto-merging src/backend/nodes/readfuncs.c Auto-merging src/backend/nodes/outfuncs.c Auto-merging src/backend/nodes/nodeFuncs.c Auto-merging src/backend/executor/execMain.c Auto-merging src/backend/commands/tablecmds.c Auto-merging src/backend/commands/event_trigger.c Auto-merging src/backend/commands/alter.c Auto-merging src/backend/catalog/sql_features.txt Auto-merging src/backend/catalog/objectaddress.c Auto-merging src/backend/catalog/aclchk.c Auto-merging doc/src/sgml/ref/select.sgml Auto-merging doc/src/sgml/ref/psql-ref.sgml Auto-merging doc/src/sgml/queries.sgml Auto-merging doc/src/sgml/func/func-info.sgml Auto-merging doc/src/sgml/catalogs.sgml Auto-merging contrib/pg_overexplain/pg_overexplain.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 WIP: SQL Property Graph Queries (SQL/PGQ) 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 contrib/pg_overexplain/pg_overexplain.c M doc/src/sgml/catalogs.sgml M doc/src/sgml/ddl.sgml M doc/src/sgml/features.sgml M doc/src/sgml/func/func-info.sgml M doc/src/sgml/information_schema.sgml M doc/src/sgml/queries.sgml M doc/src/sgml/ref/allfiles.sgml M doc/src/sgml/ref/alter_extension.sgml M doc/src/sgml/ref/comment.sgml M doc/src/sgml/ref/grant.sgml M doc/src/sgml/ref/psql-ref.sgml M doc/src/sgml/ref/revoke.sgml M doc/src/sgml/ref/security_label.sgml M doc/src/sgml/ref/select.sgml M doc/src/sgml/reference.sgml M src/backend/catalog/aclchk.c M src/backend/catalog/dependency.c M src/backend/catalog/information_schema.sql M src/backend/catalog/objectaddress.c M src/backend/catalog/pg_class.c M src/backend/catalog/sql_features.txt M src/backend/commands/Makefile M src/backend/commands/alter.c M src/backend/commands/dropcmds.c M src/backend/commands/event_trigger.c M src/backend/commands/meson.build M src/backend/commands/seclabel.c M src/backend/commands/tablecmds.c M src/backend/executor/execMain.c M src/backend/nodes/nodeFuncs.c M src/backend/nodes/outfuncs.c M src/backend/nodes/readfuncs.c M src/backend/optimizer/path/allpaths.c M src/backend/optimizer/prep/prepjointree.c M src/backend/parser/Makefile M src/backend/parser/analyze.c M src/backend/parser/gram.y M src/backend/parser/meson.build M src/backend/parser/parse_agg.c M src/backend/parser/parse_clause.c M src/backend/parser/parse_collate.c M src/backend/parser/parse_expr.c M src/backend/parser/parse_func.c M src/backend/parser/parse_relation.c M src/backend/parser/parse_target.c M src/backend/parser/scan.l M src/backend/rewrite/Makefile M src/backend/rewrite/meson.build M src/backend/rewrite/rewriteHandler.c M src/backend/tcop/utility.c M src/backend/utils/adt/ruleutils.c M src/backend/utils/cache/lsyscache.c M src/bin/pg_dump/common.c M src/bin/pg_dump/pg_backup_archiver.c M src/bin/pg_dump/pg_dump.c M src/bin/pg_dump/t/002_pg_dump.pl M src/bin/psql/command.c M src/bin/psql/describe.c M src/bin/psql/help.c M src/bin/psql/tab-complete.in.c M src/fe_utils/psqlscan.l M src/include/catalog/Makefile M src/include/catalog/meson.build M src/include/catalog/pg_class.h M src/include/catalog/pg_proc.dat M src/include/nodes/parsenodes.h M src/include/nodes/primnodes.h M src/include/parser/analyze.h M src/include/parser/kwlist.h M src/include/parser/parse_node.h M src/include/parser/parse_relation.h M src/include/tcop/cmdtaglist.h M src/include/utils/acl.h M src/include/utils/lsyscache.h M src/interfaces/ecpg/preproc/parse.pl M src/interfaces/ecpg/preproc/pgc.l M src/pl/plpgsql/src/pl_gram.y M src/test/regress/expected/alter_generic.out M src/test/regress/expected/object_address.out M src/test/regress/expected/oidjoins.out M src/test/regress/parallel_schedule M src/test/regress/sql/alter_generic.sql M src/test/regress/sql/object_address.sql M src/tools/pgindent/typedefs.list Removing doc/src/sgml/keywords/sql2023-16-nonreserved.txt Removing doc/src/sgml/keywords/sql2023-16-reserved.txt Removing doc/src/sgml/ref/alter_property_graph.sgml Removing doc/src/sgml/ref/create_property_graph.sgml Removing doc/src/sgml/ref/drop_property_graph.sgml Removing src/backend/commands/propgraphcmds.c Removing src/backend/parser/parse_graphtable.c Removing src/backend/rewrite/rewriteGraphTable.c Removing src/include/catalog/pg_propgraph_element.h Removing src/include/catalog/pg_propgraph_element_label.h Removing src/include/catalog/pg_propgraph_label.h Removing src/include/catalog/pg_propgraph_label_property.h Removing src/include/catalog/pg_propgraph_property.h Removing src/include/commands/propgraphcmds.h Removing src/include/parser/parse_graphtable.h Removing src/include/rewrite/rewriteGraphTable.h Removing src/test/regress/expected/create_property_graph.out Removing src/test/regress/expected/graph_table.out Removing src/test/regress/sql/create_property_graph.sql Removing src/test/regress/sql/graph_table.sql === using patch(1) to apply patch ./20250807/0001-WIP-SQL-Property-Graph-Queries-SQL-PGQ-20250807.patch === patching file contrib/pg_overexplain/pg_overexplain.c Hunk #1 succeeded at 443 (offset 12 lines). patching file doc/src/sgml/catalogs.sgml Hunk #2 succeeded at 2166 (offset 3 lines). Hunk #3 succeeded at 6334 (offset 3 lines). patching file doc/src/sgml/ddl.sgml patching file doc/src/sgml/features.sgml patching file doc/src/sgml/func/func-info.sgml patching file doc/src/sgml/information_schema.sgml patching file doc/src/sgml/keywords/sql2023-16-nonreserved.txt patching file doc/src/sgml/keywords/sql2023-16-reserved.txt patching file doc/src/sgml/queries.sgml Hunk #2 succeeded at 2776 (offset 26 lines). patching file doc/src/sgml/ref/allfiles.sgml patching file doc/src/sgml/ref/alter_extension.sgml patching file doc/src/sgml/ref/alter_property_graph.sgml patching file doc/src/sgml/ref/comment.sgml patching file doc/src/sgml/ref/create_property_graph.sgml patching file doc/src/sgml/ref/drop_property_graph.sgml patching file doc/src/sgml/ref/grant.sgml patching file doc/src/sgml/ref/psql-ref.sgml patching file doc/src/sgml/ref/revoke.sgml patching file doc/src/sgml/ref/security_label.sgml patching file doc/src/sgml/ref/select.sgml patching file doc/src/sgml/reference.sgml patching file src/backend/catalog/aclchk.c Hunk #1 succeeded at 290 (offset -1 lines). Hunk #2 succeeded at 537 (offset -1 lines). Hunk #3 succeeded at 611 (offset -1 lines). Hunk #4 succeeded at 708 (offset 13 lines). Hunk #5 succeeded at 826 (offset 13 lines). Hunk #6 succeeded at 1035 (offset 13 lines). Hunk #7 succeeded at 2746 (offset 13 lines). Hunk #8 succeeded at 2875 (offset 13 lines). Hunk #9 succeeded at 3014 (offset 13 lines). patching file src/backend/catalog/dependency.c patching file src/backend/catalog/information_schema.sql patching file src/backend/catalog/objectaddress.c Hunk #2 succeeded at 374 (offset -1 lines). Hunk #3 succeeded at 753 (offset -1 lines). Hunk #4 succeeded at 891 (offset -1 lines). Hunk #5 succeeded at 1035 (offset -1 lines). Hunk #6 succeeded at 1448 (offset -1 lines). Hunk #7 succeeded at 2374 (offset -1 lines). Hunk #8 succeeded at 2494 (offset -1 lines). Hunk #9 succeeded at 4072 (offset -1 lines). Hunk #10 succeeded at 4433 (offset -1 lines). Hunk #11 succeeded at 4926 (offset -1 lines). Hunk #12 succeeded at 5019 (offset -1 lines). Hunk #13 succeeded at 6186 (offset -1 lines). Hunk #14 succeeded at 6504 (offset -1 lines). patching file src/backend/catalog/pg_class.c patching file src/backend/catalog/sql_features.txt patching file src/backend/commands/Makefile patching file src/backend/commands/alter.c patching file src/backend/commands/dropcmds.c patching file src/backend/commands/event_trigger.c Hunk #1 succeeded at 2302 (offset 132 lines). Hunk #2 succeeded at 2387 (offset 132 lines). patching file src/backend/commands/meson.build patching file src/backend/commands/propgraphcmds.c patching file src/backend/commands/seclabel.c patching file src/backend/commands/tablecmds.c Hunk #1 succeeded at 308 (offset 1 line). Hunk #3 succeeded at 16100 (offset 28 lines). Hunk #4 succeeded at 19669 (offset 28 lines). patching file src/backend/executor/execMain.c Hunk #1 succeeded at 603 (offset -1 lines). Hunk #2 succeeded at 1159 (offset 18 lines). Hunk #3 succeeded at 1229 (offset 18 lines). patching file src/backend/nodes/nodeFuncs.c Hunk #4 succeeded at 2133 (offset -4 lines). Hunk #5 succeeded at 2674 (offset -4 lines). Hunk #6 succeeded at 2887 (offset -4 lines). Hunk #7 succeeded at 3945 (offset -4 lines). Hunk #8 succeeded at 4583 (offset -4 lines). Hunk #9 succeeded at 4753 (offset -4 lines). patching file src/backend/nodes/outfuncs.c patching file src/backend/nodes/readfuncs.c patching file src/backend/optimizer/path/allpaths.c Hunk #1 succeeded at 782 (offset 54 lines). patching file src/backend/optimizer/prep/prepjointree.c Hunk #1 succeeded at 1570 (offset 2 lines). Hunk #2 succeeded at 2639 (offset 2 lines). patching file src/backend/parser/Makefile patching file src/backend/parser/analyze.c Hunk #1 succeeded at 2131 with fuzz 1 (offset 28 lines). Hunk #2 succeeded at 2170 (offset 28 lines). Hunk #3 succeeded at 2204 (offset 26 lines). Hunk #4 succeeded at 2238 (offset 26 lines). patching file src/backend/parser/gram.y Hunk #1 succeeded at 293 (offset 6 lines). Hunk #2 succeeded at 679 (offset 7 lines). Hunk #3 succeeded at 752 (offset 7 lines). Hunk #4 succeeded at 784 (offset 7 lines). Hunk #5 FAILED at 789. Hunk #6 succeeded at 821 (offset 7 lines). Hunk #7 succeeded at 919 (offset 7 lines). Hunk #8 succeeded at 1046 (offset 7 lines). Hunk #9 succeeded at 1087 (offset 7 lines). Hunk #10 succeeded at 7172 (offset 28 lines). Hunk #11 succeeded at 8061 (offset 28 lines). Hunk #12 succeeded at 9394 (offset 28 lines). Hunk #13 succeeded at 10050 (offset 28 lines). Hunk #14 succeeded at 10685 (offset 28 lines). Hunk #15 succeeded at 11048 (offset 28 lines). Hunk #16 succeeded at 14222 (offset 79 lines). Hunk #17 succeeded at 15584 (offset 79 lines). Hunk #18 succeeded at 16068 (offset 79 lines). Hunk #19 succeeded at 17247 (offset 86 lines). Hunk #20 succeeded at 17829 (offset 86 lines). Hunk #21 succeeded at 18557 (offset 87 lines). Hunk #22 succeeded at 18567 (offset 87 lines). Hunk #23 succeeded at 18598 (offset 87 lines). Hunk #24 succeeded at 18664 (offset 88 lines). Hunk #25 succeeded at 18708 (offset 88 lines). Hunk #26 succeeded at 18721 (offset 88 lines). Hunk #27 succeeded at 18812 (offset 89 lines). Hunk #28 succeeded at 18852 (offset 89 lines). Hunk #29 succeeded at 19144 (offset 89 lines). Hunk #30 succeeded at 19156 (offset 89 lines). Hunk #31 succeeded at 19195 (offset 89 lines). Hunk #32 succeeded at 19292 (offset 89 lines). Hunk #33 succeeded at 19349 (offset 89 lines). Hunk #34 succeeded at 19364 (offset 89 lines). Hunk #35 succeeded at 19479 (offset 89 lines). 1 out of 35 hunks FAILED -- saving rejects to file src/backend/parser/gram.y.rej patching file src/backend/parser/meson.build patching file src/backend/parser/parse_agg.c Hunk #2 succeeded at 1004 (offset 26 lines). patching file src/backend/parser/parse_clause.c patching file src/backend/parser/parse_collate.c patching file src/backend/parser/parse_expr.c Hunk #1 succeeded at 576 (offset 1 line). Hunk #2 succeeded at 1862 (offset 1 line). Hunk #3 succeeded at 3224 (offset 1 line). patching file src/backend/parser/parse_func.c Hunk #1 succeeded at 2783 (offset 125 lines). patching file src/backend/parser/parse_graphtable.c patching file src/backend/parser/parse_relation.c patching file src/backend/parser/parse_target.c Hunk #1 succeeded at 359 (offset -1 lines). Hunk #2 succeeded at 1584 (offset -1 lines). patching file src/backend/parser/scan.l patching file src/backend/rewrite/Makefile patching file src/backend/rewrite/meson.build patching file src/backend/rewrite/rewriteGraphTable.c patching file src/backend/rewrite/rewriteHandler.c patching file src/backend/tcop/utility.c patching file src/backend/utils/adt/ruleutils.c Hunk #4 succeeded at 7921 (offset 5 lines). Hunk #5 succeeded at 8696 (offset 5 lines). Hunk #6 succeeded at 11141 (offset 28 lines). Hunk #7 succeeded at 13033 (offset 33 lines). patching file src/backend/utils/cache/lsyscache.c Hunk #1 succeeded at 34 (offset 1 line). Hunk #2 succeeded at 3883 (offset 27 lines). patching file src/bin/pg_dump/common.c patching file src/bin/pg_dump/pg_backup_archiver.c Hunk #1 succeeded at 3810 (offset 65 lines). patching file src/bin/pg_dump/pg_dump.c Hunk #1 succeeded at 1853 (offset 38 lines). Hunk #2 succeeded at 3033 (offset 41 lines). Hunk #3 succeeded at 7383 (offset 105 lines). Hunk #4 succeeded at 17119 (offset 106 lines). Hunk #5 succeeded at 17144 (offset 106 lines). Hunk #6 succeeded at 17260 (offset 106 lines). Hunk #7 succeeded at 18000 (offset 106 lines). Hunk #8 succeeded at 20042 (offset 111 lines). patching file src/bin/pg_dump/t/002_pg_dump.pl Hunk #1 succeeded at 3101 (offset -174 lines). patching file src/bin/psql/command.c Hunk #1 succeeded at 1056 (offset 21 lines). Hunk #2 succeeded at 1190 (offset 21 lines). patching file src/bin/psql/describe.c Hunk #4 succeeded at 2089 (offset 34 lines). Hunk #5 succeeded at 3189 (offset 34 lines). Hunk #6 succeeded at 4068 (offset 34 lines). Hunk #7 succeeded at 4080 (offset 34 lines). Hunk #8 succeeded at 4091 (offset 34 lines). Hunk #9 succeeded at 4111 (offset 34 lines). Hunk #10 succeeded at 4125 (offset 34 lines). Hunk #11 succeeded at 4213 (offset 34 lines). patching file src/bin/psql/help.c Hunk #1 succeeded at 246 (offset 4 lines). patching file src/bin/psql/tab-complete.in.c Hunk #1 succeeded at 815 (offset 20 lines). Hunk #2 succeeded at 1343 (offset 20 lines). Hunk #3 succeeded at 2735 (offset 23 lines). Hunk #4 succeeded at 3268 (offset 23 lines). Hunk #5 succeeded at 3306 (offset 23 lines). Hunk #6 succeeded at 3638 (offset 34 lines). Hunk #7 succeeded at 4369 (offset 35 lines). Hunk #8 succeeded at 4619 (offset 35 lines). Hunk #9 succeeded at 4778 (offset 41 lines). Hunk #10 succeeded at 5109 (offset 41 lines). Hunk #11 succeeded at 5550 (offset 41 lines). patching file src/fe_utils/psqlscan.l patching file src/include/catalog/Makefile patching file src/include/catalog/meson.build patching file src/include/catalog/pg_class.h patching file src/include/catalog/pg_proc.dat Hunk #1 succeeded at 3952 (offset 12 lines). patching file src/include/catalog/pg_propgraph_element.h patching file src/include/catalog/pg_propgraph_element_label.h patching file src/include/catalog/pg_propgraph_label.h patching file src/include/catalog/pg_propgraph_label_property.h patching file src/include/catalog/pg_propgraph_property.h patching file src/include/commands/propgraphcmds.h patching file src/include/nodes/parsenodes.h Hunk #1 succeeded at 710 (offset 2 lines). Hunk #2 succeeded at 989 (offset 2 lines). Hunk #3 succeeded at 1097 (offset 2 lines). Hunk #4 succeeded at 1264 (offset 2 lines). Hunk #5 succeeded at 2408 (offset 3 lines). Hunk #6 succeeded at 4203 (offset 3 lines). patching file src/include/nodes/primnodes.h Hunk #1 succeeded at 2177 (offset 14 lines). patching file src/include/parser/analyze.h patching file src/include/parser/kwlist.h Hunk #4 succeeded at 300 (offset 1 line). Hunk #5 succeeded at 364 (offset 1 line). Hunk #6 succeeded at 379 (offset 1 line). Hunk #7 succeeded at 500 (offset 2 lines). patching file src/include/parser/parse_graphtable.h patching file src/include/parser/parse_node.h patching file src/include/parser/parse_relation.h patching file src/include/rewrite/rewriteGraphTable.h patching file src/include/tcop/cmdtaglist.h patching file src/include/utils/acl.h patching file src/include/utils/lsyscache.h patching file src/interfaces/ecpg/preproc/parse.pl patching file src/interfaces/ecpg/preproc/pgc.l patching file src/pl/plpgsql/src/pl_gram.y patching file src/test/regress/expected/alter_generic.out patching file src/test/regress/expected/create_property_graph.out patching file src/test/regress/expected/graph_table.out patching file src/test/regress/expected/object_address.out patching file src/test/regress/expected/oidjoins.out patching file src/test/regress/parallel_schedule Hunk #2 succeeded at 76 with fuzz 2 (offset -2 lines). patching file src/test/regress/sql/alter_generic.sql patching file src/test/regress/sql/create_property_graph.sql patching file src/test/regress/sql/graph_table.sql patching file src/test/regress/sql/object_address.sql patching file src/tools/pgindent/typedefs.list Hunk #1 succeeded at 4354 (offset 6 lines). Unstaged changes after reset: M contrib/pg_overexplain/pg_overexplain.c M doc/src/sgml/catalogs.sgml M doc/src/sgml/ddl.sgml M doc/src/sgml/features.sgml M doc/src/sgml/func/func-info.sgml M doc/src/sgml/information_schema.sgml M doc/src/sgml/queries.sgml M doc/src/sgml/ref/allfiles.sgml M doc/src/sgml/ref/alter_extension.sgml M doc/src/sgml/ref/comment.sgml M doc/src/sgml/ref/grant.sgml M doc/src/sgml/ref/psql-ref.sgml M doc/src/sgml/ref/revoke.sgml M doc/src/sgml/ref/security_label.sgml M doc/src/sgml/ref/select.sgml M doc/src/sgml/reference.sgml M src/backend/catalog/aclchk.c M src/backend/catalog/dependency.c M src/backend/catalog/information_schema.sql M src/backend/catalog/objectaddress.c M src/backend/catalog/pg_class.c M src/backend/catalog/sql_features.txt M src/backend/commands/Makefile M src/backend/commands/alter.c M src/backend/commands/dropcmds.c M src/backend/commands/event_trigger.c M src/backend/commands/meson.build M src/backend/commands/seclabel.c M src/backend/commands/tablecmds.c M src/backend/executor/execMain.c M src/backend/nodes/nodeFuncs.c M src/backend/nodes/outfuncs.c M src/backend/nodes/readfuncs.c M src/backend/optimizer/path/allpaths.c M src/backend/optimizer/prep/prepjointree.c M src/backend/parser/Makefile M src/backend/parser/analyze.c M src/backend/parser/gram.y M src/backend/parser/meson.build M src/backend/parser/parse_agg.c M src/backend/parser/parse_clause.c M src/backend/parser/parse_collate.c M src/backend/parser/parse_expr.c M src/backend/parser/parse_func.c M src/backend/parser/parse_relation.c M src/backend/parser/parse_target.c M src/backend/parser/scan.l M src/backend/rewrite/Makefile M src/backend/rewrite/meson.build M src/backend/rewrite/rewriteHandler.c M src/backend/tcop/utility.c M src/backend/utils/adt/ruleutils.c M src/backend/utils/cache/lsyscache.c M src/bin/pg_dump/common.c M src/bin/pg_dump/pg_backup_archiver.c M src/bin/pg_dump/pg_dump.c M src/bin/pg_dump/t/002_pg_dump.pl M src/bin/psql/command.c M src/bin/psql/describe.c M src/bin/psql/help.c M src/bin/psql/tab-complete.in.c M src/fe_utils/psqlscan.l M src/include/catalog/Makefile M src/include/catalog/meson.build M src/include/catalog/pg_class.h M src/include/catalog/pg_proc.dat M src/include/nodes/parsenodes.h M src/include/nodes/primnodes.h M src/include/parser/analyze.h M src/include/parser/kwlist.h M src/include/parser/parse_node.h M src/include/parser/parse_relation.h M src/include/tcop/cmdtaglist.h M src/include/utils/acl.h M src/include/utils/lsyscache.h M src/interfaces/ecpg/preproc/parse.pl M src/interfaces/ecpg/preproc/pgc.l M src/pl/plpgsql/src/pl_gram.y M src/test/regress/expected/alter_generic.out M src/test/regress/expected/object_address.out M src/test/regress/expected/oidjoins.out M src/test/regress/parallel_schedule M src/test/regress/sql/alter_generic.sql M src/test/regress/sql/object_address.sql M src/tools/pgindent/typedefs.list Removing doc/src/sgml/keywords/sql2023-16-nonreserved.txt Removing doc/src/sgml/keywords/sql2023-16-reserved.txt Removing doc/src/sgml/ref/alter_property_graph.sgml Removing doc/src/sgml/ref/create_property_graph.sgml Removing doc/src/sgml/ref/drop_property_graph.sgml Removing src/backend/commands/propgraphcmds.c Removing src/backend/parser/gram.y.rej Removing src/backend/parser/parse_graphtable.c Removing src/backend/rewrite/rewriteGraphTable.c Removing src/include/catalog/pg_propgraph_element.h Removing src/include/catalog/pg_propgraph_element_label.h Removing src/include/catalog/pg_propgraph_label.h Removing src/include/catalog/pg_propgraph_label_property.h Removing src/include/catalog/pg_propgraph_property.h Removing src/include/commands/propgraphcmds.h Removing src/include/parser/parse_graphtable.h Removing src/include/rewrite/rewriteGraphTable.h Removing src/test/regress/expected/create_property_graph.out Removing src/test/regress/expected/graph_table.out Removing src/test/regress/sql/create_property_graph.sql Removing src/test/regress/sql/graph_table.sql === using 'git apply' to apply patch ./20250807/0001-WIP-SQL-Property-Graph-Queries-SQL-PGQ-20250807.patch === Applied patch to 'contrib/pg_overexplain/pg_overexplain.c' cleanly. Applied patch to 'doc/src/sgml/catalogs.sgml' cleanly. Applied patch to 'doc/src/sgml/ddl.sgml' cleanly. Applied patch to 'doc/src/sgml/features.sgml' cleanly. Applied patch to 'doc/src/sgml/func/func-info.sgml' cleanly. Applied patch to 'doc/src/sgml/information_schema.sgml' cleanly. Falling back to direct application... Falling back to direct application... Applied patch to 'doc/src/sgml/queries.sgml' cleanly. Applied patch to 'doc/src/sgml/ref/allfiles.sgml' cleanly. Applied patch to 'doc/src/sgml/ref/alter_extension.sgml' cleanly. Falling back to direct application... Applied patch to 'doc/src/sgml/ref/comment.sgml' cleanly. Falling back to direct application... Falling back to direct application... Applied patch to 'doc/src/sgml/ref/grant.sgml' cleanly. Applied patch to 'doc/src/sgml/ref/psql-ref.sgml' cleanly. Applied patch to 'doc/src/sgml/ref/revoke.sgml' cleanly. Applied patch to 'doc/src/sgml/ref/security_label.sgml' cleanly. Applied patch to 'doc/src/sgml/ref/select.sgml' cleanly. Applied patch to 'doc/src/sgml/reference.sgml' cleanly. Applied patch to 'src/backend/catalog/aclchk.c' cleanly. Applied patch to 'src/backend/catalog/dependency.c' cleanly. Applied patch to 'src/backend/catalog/information_schema.sql' cleanly. Applied patch to 'src/backend/catalog/objectaddress.c' cleanly. Applied patch to 'src/backend/catalog/pg_class.c' cleanly. Applied patch to 'src/backend/catalog/sql_features.txt' cleanly. Applied patch to 'src/backend/commands/Makefile' cleanly. Applied patch to 'src/backend/commands/alter.c' cleanly. Applied patch to 'src/backend/commands/dropcmds.c' cleanly. Applied patch to 'src/backend/commands/event_trigger.c' cleanly. Applied patch to 'src/backend/commands/meson.build' cleanly. Falling back to direct application... Applied patch to 'src/backend/commands/seclabel.c' cleanly. Applied patch to 'src/backend/commands/tablecmds.c' cleanly. Applied patch to 'src/backend/executor/execMain.c' cleanly. Applied patch to 'src/backend/nodes/nodeFuncs.c' cleanly. Applied patch to 'src/backend/nodes/outfuncs.c' cleanly. Applied patch to 'src/backend/nodes/readfuncs.c' cleanly. Applied patch to 'src/backend/optimizer/path/allpaths.c' cleanly. Applied patch to 'src/backend/optimizer/prep/prepjointree.c' cleanly. Applied patch to 'src/backend/parser/Makefile' cleanly. Applied patch to 'src/backend/parser/analyze.c' cleanly. Applied patch to 'src/backend/parser/gram.y' with conflicts. Applied patch to 'src/backend/parser/meson.build' 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_collate.c' cleanly. Applied patch to 'src/backend/parser/parse_expr.c' cleanly. Applied patch to 'src/backend/parser/parse_func.c' cleanly. Falling back to direct application... Applied patch to 'src/backend/parser/parse_relation.c' cleanly. Applied patch to 'src/backend/parser/parse_target.c' cleanly. Applied patch to 'src/backend/parser/scan.l' cleanly. Applied patch to 'src/backend/rewrite/Makefile' cleanly. Applied patch to 'src/backend/rewrite/meson.build' cleanly. Falling back to direct application... Applied patch to 'src/backend/rewrite/rewriteHandler.c' cleanly. Applied patch to 'src/backend/tcop/utility.c' cleanly. Applied patch to 'src/backend/utils/adt/ruleutils.c' cleanly. Applied patch to 'src/backend/utils/cache/lsyscache.c' cleanly. Applied patch to 'src/bin/pg_dump/common.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_backup_archiver.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_dump.c' cleanly. Applied patch to 'src/bin/pg_dump/t/002_pg_dump.pl' cleanly. Applied patch to 'src/bin/psql/command.c' cleanly. Applied patch to 'src/bin/psql/describe.c' cleanly. Applied patch to 'src/bin/psql/help.c' cleanly. Applied patch to 'src/bin/psql/tab-complete.in.c' cleanly. Applied patch to 'src/fe_utils/psqlscan.l' cleanly. Applied patch to 'src/include/catalog/Makefile' cleanly. Applied patch to 'src/include/catalog/meson.build' cleanly. Applied patch to 'src/include/catalog/pg_class.h' cleanly. Applied patch to 'src/include/catalog/pg_proc.dat' cleanly. Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Applied patch to 'src/include/nodes/parsenodes.h' cleanly. Applied patch to 'src/include/nodes/primnodes.h' cleanly. Applied patch to 'src/include/parser/analyze.h' cleanly. Applied patch to 'src/include/parser/kwlist.h' cleanly. Falling back to direct application... Applied patch to 'src/include/parser/parse_node.h' cleanly. Applied patch to 'src/include/parser/parse_relation.h' cleanly. Falling back to direct application... Applied patch to 'src/include/tcop/cmdtaglist.h' cleanly. Applied patch to 'src/include/utils/acl.h' cleanly. Applied patch to 'src/include/utils/lsyscache.h' cleanly. Applied patch to 'src/interfaces/ecpg/preproc/parse.pl' cleanly. Applied patch to 'src/interfaces/ecpg/preproc/pgc.l' cleanly. Applied patch to 'src/pl/plpgsql/src/pl_gram.y' cleanly. Applied patch to 'src/test/regress/expected/alter_generic.out' cleanly. Falling back to direct application... Falling back to direct application... Applied patch to 'src/test/regress/expected/object_address.out' cleanly. Applied patch to 'src/test/regress/expected/oidjoins.out' cleanly. Applied patch to 'src/test/regress/parallel_schedule' cleanly. Applied patch to 'src/test/regress/sql/alter_generic.sql' cleanly. Falling back to direct application... Falling back to direct application... Applied patch to 'src/test/regress/sql/object_address.sql' cleanly. Applied patch to 'src/tools/pgindent/typedefs.list' cleanly. U src/backend/parser/gram.y diff --cc src/backend/parser/gram.y index 8a0470d5b84,a9aafa69025..00000000000 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@@ -770,8 -794,8 +801,13 @@@ static Node *makeRecursiveViewSelect(ch QUOTE QUOTES RANGE READ REAL REASSIGN RECURSIVE REF_P REFERENCES REFERENCING ++<<<<<<< ours + REFRESH REINDEX RELATIVE_P RELEASE RENAME REPEATABLE REPLACE REPLICA + RESET RESPECT_P RESTART RESTRICT RETURN RETURNING RETURNS REVOKE RIGHT ROLE ROLLBACK ROLLUP ++======= + REFRESH REINDEX RELATIONSHIP RELATIVE_P RELEASE RENAME REPEATABLE REPLACE REPLICA + RESET RESTART RESTRICT RETURN RETURNING RETURNS REVOKE RIGHT ROLE ROLLBACK ROLLUP ++>>>>>>> theirs ROUTINE ROUTINES ROW ROWS RULE SAVEPOINT SCALAR SCHEMA SCHEMAS SCROLL SEARCH SECOND_P SECURITY SELECT