=== Applying patches on top of PostgreSQL commit ID aaf9e95e8764093ab55baf27c35705f406f592f9 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Mon Apr 28 06:53:23 UTC 2025 === expanding ./pg-sql-pgq-20250311.zip Archive: ./pg-sql-pgq-20250311.zip extracting: 0001-WIP-SQL-Property-Graph-Queries-SQL-PGQ-20250311.patch extracting: 0002-support-WHERE-clause-in-graph-pattern-20250311.patch extracting: 0003-Support-cyclic-path-pattern-20250311.patch extracting: 0004-Fixes-following-issues-20250311.patch extracting: 0005-Access-permissions-on-property-graph-20250311.patch extracting: 0006-Property-collation-and-edge-vertex-link-sup-20250311.patch extracting: 0007-RLS-tests-20250311.patch extracting: 0008-Document-fixes-20250311.patch extracting: 0009-WIP-Do-not-print-empty-columns-table-for-a--20250311.patch extracting: 0010-dG-tests-and-improvements-20250311.patch On branch cf/4904 nothing to commit, working tree clean === using 'git am' to apply patch ./0001-WIP-SQL-Property-Graph-Queries-SQL-PGQ-20250311.patch === Applying: WIP: SQL Property Graph Queries (SQL/PGQ) Using index info to reconstruct a base tree... M doc/src/sgml/catalogs.sgml M doc/src/sgml/ddl.sgml M doc/src/sgml/func.sgml M doc/src/sgml/ref/psql-ref.sgml M src/backend/catalog/aclchk.c M src/backend/catalog/objectaddress.c M src/backend/catalog/sql_features.txt M src/backend/commands/Makefile M src/backend/commands/alter.c M src/backend/commands/meson.build M src/backend/commands/tablecmds.c M src/backend/executor/execMain.c M src/backend/nodes/outfuncs.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_clause.c M src/backend/parser/parse_expr.c M src/backend/utils/adt/ruleutils.c M src/backend/utils/cache/lsyscache.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/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_relation.h M src/include/utils/lsyscache.h M src/test/regress/expected/alter_generic.out M src/test/regress/parallel_schedule M src/test/regress/sql/alter_generic.sql M src/tools/pgindent/typedefs.list Falling back to patching base and 3-way merge... Auto-merging src/tools/pgindent/typedefs.list CONFLICT (content): Merge conflict in src/tools/pgindent/typedefs.list Auto-merging src/test/regress/sql/alter_generic.sql Auto-merging src/test/regress/parallel_schedule Auto-merging src/test/regress/expected/alter_generic.out Auto-merging src/include/utils/lsyscache.h Auto-merging src/include/parser/parse_relation.h Auto-merging src/include/parser/kwlist.h Auto-merging src/include/parser/analyze.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/include/catalog/pg_class.h Auto-merging src/fe_utils/psqlscan.l 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/backend/utils/cache/lsyscache.c Auto-merging src/backend/utils/adt/ruleutils.c Auto-merging src/backend/parser/parse_expr.c Auto-merging src/backend/parser/parse_clause.c Auto-merging 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/outfuncs.c Auto-merging src/backend/executor/execMain.c Auto-merging src/backend/commands/tablecmds.c Auto-merging src/backend/commands/meson.build Auto-merging src/backend/commands/alter.c Auto-merging src/backend/commands/Makefile Auto-merging src/backend/catalog/sql_features.txt Auto-merging src/backend/catalog/objectaddress.c Auto-merging src/backend/catalog/aclchk.c CONFLICT (content): Merge conflict in src/backend/catalog/aclchk.c Auto-merging doc/src/sgml/ref/psql-ref.sgml Auto-merging doc/src/sgml/func.sgml Auto-merging doc/src/sgml/ddl.sgml Auto-merging doc/src/sgml/catalogs.sgml 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 doc/src/sgml/catalogs.sgml M doc/src/sgml/ddl.sgml M doc/src/sgml/features.sgml M doc/src/sgml/func.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 ./0001-WIP-SQL-Property-Graph-Queries-SQL-PGQ-20250311.patch === patching file doc/src/sgml/catalogs.sgml patching file doc/src/sgml/ddl.sgml Hunk #1 succeeded at 2007 (offset -5 lines). Hunk #2 succeeded at 5351 (offset 1 line). patching file doc/src/sgml/features.sgml patching file doc/src/sgml/func.sgml Hunk #1 succeeded at 26286 (offset -2 lines). 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 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 #6 succeeded at 1022 with fuzz 2 (offset 4 lines). Hunk #7 succeeded at 2733 (offset 17 lines). Hunk #8 succeeded at 2862 (offset 17 lines). Hunk #9 succeeded at 3001 (offset 17 lines). patching file src/backend/catalog/dependency.c patching file src/backend/catalog/information_schema.sql patching file src/backend/catalog/objectaddress.c Hunk #7 succeeded at 2375 (offset 4 lines). Hunk #8 succeeded at 2495 (offset 4 lines). Hunk #9 succeeded at 4073 (offset 10 lines). Hunk #10 succeeded at 4434 (offset 10 lines). Hunk #11 succeeded at 4927 (offset 10 lines). Hunk #12 succeeded at 5020 (offset 10 lines). Hunk #13 succeeded at 6187 (offset 14 lines). Hunk #14 succeeded at 6505 (offset 14 lines). patching file src/backend/catalog/pg_class.c patching file src/backend/catalog/sql_features.txt patching file src/backend/commands/Makefile Hunk #1 succeeded at 49 (offset 1 line). patching file src/backend/commands/alter.c Hunk #1 succeeded at 396 (offset 16 lines). Hunk #2 succeeded at 550 (offset 16 lines). Hunk #3 succeeded at 884 (offset 16 lines). Hunk #4 succeeded at 893 (offset 16 lines). patching file src/backend/commands/dropcmds.c patching file src/backend/commands/event_trigger.c patching file src/backend/commands/meson.build Hunk #1 succeeded at 37 (offset 1 line). patching file src/backend/commands/propgraphcmds.c patching file src/backend/commands/seclabel.c patching file src/backend/commands/tablecmds.c Hunk #2 succeeded at 1592 (offset 41 lines). Hunk #3 succeeded at 16033 (offset 769 lines). Hunk #4 succeeded at 19604 (offset 773 lines). patching file src/backend/executor/execMain.c Hunk #1 succeeded at 682 (offset 3 lines). Hunk #2 succeeded at 1245 (offset 3 lines). Hunk #3 succeeded at 1315 (offset 3 lines). patching file src/backend/nodes/nodeFuncs.c patching file src/backend/nodes/outfuncs.c Hunk #1 succeeded at 562 (offset 3 lines). patching file src/backend/nodes/readfuncs.c patching file src/backend/optimizer/path/allpaths.c patching file src/backend/optimizer/prep/prepjointree.c Hunk #1 succeeded at 1508 (offset 12 lines). Hunk #2 succeeded at 2577 (offset 5 lines). patching file src/backend/parser/Makefile patching file src/backend/parser/analyze.c Hunk #1 succeeded at 2188 (offset 39 lines). Hunk #2 succeeded at 2227 (offset 39 lines). Hunk #3 succeeded at 2263 (offset 39 lines). Hunk #4 succeeded at 2297 (offset 39 lines). patching file src/backend/parser/gram.y Hunk #10 succeeded at 7084 (offset -6 lines). Hunk #11 succeeded at 7941 (offset -6 lines). Hunk #12 succeeded at 9274 (offset -5 lines). Hunk #13 succeeded at 9934 (offset -5 lines). Hunk #14 succeeded at 10569 (offset -5 lines). Hunk #15 succeeded at 10932 (offset -5 lines). Hunk #16 succeeded at 14113 (offset -5 lines). Hunk #17 succeeded at 15468 (offset -5 lines). Hunk #18 succeeded at 15951 (offset -5 lines). Hunk #19 succeeded at 17123 (offset -5 lines). Hunk #20 succeeded at 17716 (offset -5 lines). Hunk #21 succeeded at 18443 (offset -5 lines). Hunk #22 succeeded at 18453 (offset -5 lines). Hunk #23 succeeded at 18484 (offset -5 lines). Hunk #24 succeeded at 18549 (offset -5 lines). Hunk #25 succeeded at 18593 (offset -4 lines). Hunk #26 succeeded at 18606 (offset -4 lines). Hunk #27 succeeded at 18696 (offset -4 lines). Hunk #28 succeeded at 18736 (offset -4 lines). Hunk #29 succeeded at 19028 (offset -4 lines). Hunk #30 succeeded at 19040 (offset -4 lines). Hunk #31 succeeded at 19079 (offset -4 lines). Hunk #32 succeeded at 19176 (offset -4 lines). Hunk #33 succeeded at 19233 (offset -3 lines). Hunk #34 succeeded at 19248 (offset -3 lines). Hunk #35 succeeded at 19363 (offset -3 lines). patching file src/backend/parser/meson.build patching file src/backend/parser/parse_agg.c 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 #3 succeeded at 3219 (offset 8 lines). patching file src/backend/parser/parse_func.c patching file src/backend/parser/parse_graphtable.c patching file src/backend/parser/parse_relation.c patching file src/backend/parser/parse_target.c 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 #3 succeeded at 1608 (offset 3 lines). Hunk #4 succeeded at 7906 (offset 52 lines). Hunk #5 succeeded at 8681 (offset 52 lines). Hunk #6 succeeded at 11103 (offset 52 lines). Hunk #7 succeeded at 12990 (offset 72 lines). patching file src/backend/utils/cache/lsyscache.c Hunk #2 succeeded at 3856 (offset 101 lines). patching file src/bin/pg_dump/common.c patching file src/bin/pg_dump/pg_backup_archiver.c Hunk #1 succeeded at 3736 (offset 67 lines). patching file src/bin/pg_dump/pg_dump.c Hunk #1 succeeded at 1786 (offset 43 lines). Hunk #2 succeeded at 2956 (offset 43 lines). Hunk #3 succeeded at 7168 (offset 96 lines). Hunk #4 succeeded at 16770 (offset 381 lines). Hunk #5 succeeded at 16795 (offset 381 lines). Hunk #6 succeeded at 16911 (offset 381 lines). Hunk #7 succeeded at 17651 (offset 376 lines). Hunk #8 succeeded at 19613 (offset 397 lines). patching file src/bin/pg_dump/t/002_pg_dump.pl Hunk #1 succeeded at 3111 (offset 54 lines). patching file src/bin/psql/command.c Hunk #1 succeeded at 1032 (offset 3 lines). Hunk #2 succeeded at 1166 (offset 3 lines). patching file src/bin/psql/describe.c Hunk #4 succeeded at 2054 (offset 4 lines). Hunk #5 succeeded at 3154 (offset -5 lines). Hunk #6 succeeded at 4033 (offset -5 lines). Hunk #7 succeeded at 4045 (offset -5 lines). Hunk #8 succeeded at 4056 (offset -5 lines). Hunk #9 succeeded at 4076 (offset -5 lines). Hunk #10 succeeded at 4090 (offset -5 lines). Hunk #11 succeeded at 4178 (offset -5 lines). patching file src/bin/psql/help.c Hunk #1 succeeded at 242 (offset -12 lines). patching file src/bin/psql/tab-complete.in.c Hunk #3 succeeded at 2678 (offset 1 line). Hunk #4 succeeded at 3188 (offset 4 lines). Hunk #5 succeeded at 3226 (offset 4 lines). Hunk #6 succeeded at 3546 (offset 4 lines). Hunk #7 succeeded at 4274 (offset 4 lines). Hunk #8 succeeded at 4524 (offset 4 lines). Hunk #9 succeeded at 4653 (offset 4 lines). Hunk #10 succeeded at 4984 (offset 4 lines). Hunk #11 succeeded at 5425 (offset 9 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 3939 (offset 40 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 #4 succeeded at 1247 (offset 5 lines). Hunk #5 succeeded at 2400 (offset 5 lines). Hunk #6 succeeded at 4162 (offset 7 lines). patching file src/include/nodes/primnodes.h patching file src/include/parser/analyze.h Hunk #1 succeeded at 64 (offset 1 line). patching file src/include/parser/kwlist.h Hunk #5 succeeded at 363 (offset 1 line). Hunk #6 succeeded at 378 (offset 1 line). Hunk #7 succeeded at 498 (offset 1 line). 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 Hunk #1 succeeded at 211 (offset 4 lines). 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 Hunk #1 succeeded at 524 (offset 4 lines). Hunk #2 succeeded at 757 (offset 4 lines). Hunk #3 succeeded at 774 (offset 4 lines). Hunk #4 succeeded at 790 (offset 4 lines). 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 patching file src/test/regress/sql/alter_generic.sql Hunk #1 succeeded at 459 (offset 3 lines). 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 FAILED at 4244. 1 out of 1 hunk FAILED -- saving rejects to file src/tools/pgindent/typedefs.list.rej Unstaged changes after reset: M doc/src/sgml/catalogs.sgml M doc/src/sgml/ddl.sgml M doc/src/sgml/features.sgml M doc/src/sgml/func.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 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 Removing src/tools/pgindent/typedefs.list.rej === using 'git apply' to apply patch ./0001-WIP-SQL-Property-Graph-Queries-SQL-PGQ-20250311.patch === 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.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' with conflicts. 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' cleanly. 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' with conflicts. U src/backend/catalog/aclchk.c U src/tools/pgindent/typedefs.list diff --cc src/backend/catalog/aclchk.c index 9ca8a88dc91,5bf8bdcfa3e..00000000000 --- a/src/backend/catalog/aclchk.c +++ b/src/backend/catalog/aclchk.c @@@ -1005,9 -1018,9 +1018,15 @@@ ExecAlterDefaultPrivilegesStmt(ParseSta all_privileges = ACL_ALL_RIGHTS_SCHEMA; errormsg = gettext_noop("invalid privilege type %s for schema"); break; ++<<<<<<< ours + case OBJECT_LARGEOBJECT: + all_privileges = ACL_ALL_RIGHTS_LARGEOBJECT; + errormsg = gettext_noop("invalid privilege type %s for large object"); ++======= + case OBJECT_PROPGRAPH: + all_privileges = ACL_ALL_RIGHTS_PROPGRAPH; + errormsg = gettext_noop("invalid privilege type %s for property graph"); ++>>>>>>> theirs break; default: elog(ERROR, "unrecognized GrantStmt.objtype: %d", diff --cc src/tools/pgindent/typedefs.list index e5879e00dff,fb98fc72554..00000000000 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@@ -4305,6 -4244,24 +4305,30 @@@ yyscan_ z_stream z_streamp zic_t ++<<<<<<< ours +ExplainExtensionOption +ExplainOptionHandler +overexplain_options ++======= + + # TODO + AlterPropGraphElementKind + AlterPropGraphStmt + CreatePropGraphStmt + FormData_pg_propgraph_element + FormData_pg_propgraph_element_label + FormData_pg_propgraph_label + FormData_pg_propgraph_label_property + FormData_pg_propgraph_property + GraphElementPattern + GraphElementPatternKind + GraphLabelRef + GraphPattern + GraphPropertyRef + GraphTableParseState + PropGraphEdge + PropGraphLabelAndProperties + PropGraphProperties + PropGraphVertex + RangeGraphTable ++>>>>>>> theirs