=== Applying patches on top of PostgreSQL commit ID 0123ce131fca454009439dfa3b2266d1d40737d7 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sun Mar 15 00:58:27 UTC 2026 === expanding ./v20260311_SQL_PGQ.tar.gz x v20260311-0003-Ignore-ecpg-output-files-in-git.patch x v20260311-0001-WIP-SQL-Property-Graph-Queries-SQL-PGQ.patch x v20260311-0005-Support-all-properties-reference-in-COLUMN.patch x v20260311-0002-Simplify-property-not-found-error-message.patch x v20260311-0004-Error-message-for-all-properties-reference.patch === expanding ./v20260311_SQL_PGQ.tar.gz On branch cf/4904 nothing to commit, working tree clean === using 'git am' to apply patch ./v20260311-0001-WIP-SQL-Property-Graph-Queries-SQL-PGQ.patch === Applying: WIP: SQL Property Graph Queries (SQL/PGQ) Using index info to reconstruct a base tree... M src/backend/commands/tablecmds.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/parse_expr.c M src/backend/rewrite/rewriteHandler.c M src/backend/utils/adt/acl.c M src/backend/utils/adt/ruleutils.c M src/backend/utils/cache/lsyscache.c M src/include/utils/lsyscache.h 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/include/utils/lsyscache.h Auto-merging src/backend/utils/cache/lsyscache.c Auto-merging src/backend/utils/adt/ruleutils.c Auto-merging src/backend/utils/adt/acl.c Auto-merging src/backend/rewrite/rewriteHandler.c Auto-merging src/backend/parser/parse_expr.c Auto-merging src/backend/parser/analyze.c CONFLICT (content): Merge conflict in 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/commands/tablecmds.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/expected/pg_overexplain.out M contrib/pg_overexplain/pg_overexplain.c M contrib/pg_overexplain/sql/pg_overexplain.sql 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/print.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/acl.c M src/backend/utils/adt/ruleutils.c M src/backend/utils/cache/lsyscache.c M src/backend/utils/cache/plancache.c M src/bin/pg_dump/common.c M src/bin/pg_dump/dumputils.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/pgc.l M src/interfaces/ecpg/test/ecpg_schedule M src/interfaces/ecpg/test/sql/Makefile M src/interfaces/ecpg/test/sql/meson.build 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/expected/privileges.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/test/regress/sql/privileges.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/interfaces/ecpg/test/expected/sql-sqlpgq.c Removing src/interfaces/ecpg/test/expected/sql-sqlpgq.stderr Removing src/interfaces/ecpg/test/expected/sql-sqlpgq.stdout Removing src/interfaces/ecpg/test/sql/sqlpgq.pgc Removing src/test/regress/expected/create_property_graph.out Removing src/test/regress/expected/graph_table.out Removing src/test/regress/expected/graph_table_rls.out Removing src/test/regress/sql/create_property_graph.sql Removing src/test/regress/sql/graph_table.sql Removing src/test/regress/sql/graph_table_rls.sql === using patch(1) to apply patch ./v20260311-0001-WIP-SQL-Property-Graph-Queries-SQL-PGQ.patch === patching file contrib/pg_overexplain/expected/pg_overexplain.out patching file contrib/pg_overexplain/pg_overexplain.c patching file contrib/pg_overexplain/sql/pg_overexplain.sql patching file doc/src/sgml/catalogs.sgml 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 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 patching file src/backend/catalog/dependency.c patching file src/backend/catalog/information_schema.sql patching file src/backend/catalog/objectaddress.c 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 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 #2 succeeded at 1552 (offset 8 lines). Hunk #3 succeeded at 1616 (offset 8 lines). Hunk #4 succeeded at 4225 (offset 8 lines). Hunk #5 succeeded at 16335 (offset 200 lines). Hunk #6 succeeded at 19904 (offset 200 lines). patching file src/backend/executor/execMain.c patching file src/backend/nodes/nodeFuncs.c patching file src/backend/nodes/outfuncs.c patching file src/backend/nodes/print.c 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 1631 (offset 55 lines). Hunk #2 succeeded at 2700 (offset 55 lines). patching file src/backend/parser/Makefile patching file src/backend/parser/analyze.c Hunk #1 FAILED at 2142. Hunk #2 FAILED at 2182. Hunk #3 FAILED at 2214. Hunk #4 FAILED at 2250. 4 out of 4 hunks FAILED -- saving rejects to file src/backend/parser/analyze.c.rej patching file src/backend/parser/gram.y 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 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 Hunk #3 FAILED at 197. Hunk #4 FAILED at 205. 2 out of 5 hunks FAILED -- saving rejects to file src/backend/rewrite/rewriteHandler.c.rej patching file src/backend/tcop/utility.c patching file src/backend/utils/adt/acl.c Hunk #1 succeeded at 890 (offset 10 lines). patching file src/backend/utils/adt/ruleutils.c Hunk #4 succeeded at 7937 (offset 3 lines). Hunk #5 succeeded at 8712 (offset 3 lines). Hunk #6 succeeded at 11157 (offset 3 lines). Hunk #7 succeeded at 13047 (offset 3 lines). patching file src/backend/utils/cache/lsyscache.c Hunk #2 succeeded at 3936 (offset 68 lines). patching file src/backend/utils/cache/plancache.c patching file src/bin/pg_dump/common.c patching file src/bin/pg_dump/dumputils.c patching file src/bin/pg_dump/pg_backup_archiver.c patching file src/bin/pg_dump/pg_dump.c patching file src/bin/pg_dump/t/002_pg_dump.pl patching file src/bin/psql/command.c patching file src/bin/psql/describe.c patching file src/bin/psql/help.c patching file src/bin/psql/tab-complete.in.c 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 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 patching file src/include/nodes/primnodes.h patching file src/include/parser/analyze.h patching file src/include/parser/kwlist.h 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 213 (offset 2 lines). patching file src/interfaces/ecpg/preproc/pgc.l patching file src/interfaces/ecpg/test/ecpg_schedule patching file src/interfaces/ecpg/test/expected/sql-sqlpgq.c patching file src/interfaces/ecpg/test/expected/sql-sqlpgq.stderr patching file src/interfaces/ecpg/test/expected/sql-sqlpgq.stdout patching file src/interfaces/ecpg/test/sql/Makefile patching file src/interfaces/ecpg/test/sql/meson.build patching file src/interfaces/ecpg/test/sql/sqlpgq.pgc 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/graph_table_rls.out patching file src/test/regress/expected/object_address.out patching file src/test/regress/expected/oidjoins.out patching file src/test/regress/expected/privileges.out patching file src/test/regress/parallel_schedule 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/graph_table_rls.sql patching file src/test/regress/sql/object_address.sql patching file src/test/regress/sql/privileges.sql patching file src/tools/pgindent/typedefs.list Hunk #1 succeeded at 4462 (offset 29 lines). Unstaged changes after reset: M contrib/pg_overexplain/expected/pg_overexplain.out M contrib/pg_overexplain/pg_overexplain.c M contrib/pg_overexplain/sql/pg_overexplain.sql 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/print.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/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/acl.c M src/backend/utils/adt/ruleutils.c M src/backend/utils/cache/lsyscache.c M src/backend/utils/cache/plancache.c M src/bin/pg_dump/common.c M src/bin/pg_dump/dumputils.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/pgc.l M src/interfaces/ecpg/test/ecpg_schedule M src/interfaces/ecpg/test/sql/Makefile M src/interfaces/ecpg/test/sql/meson.build 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/expected/privileges.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/test/regress/sql/privileges.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/analyze.c.rej Removing src/backend/parser/parse_graphtable.c Removing src/backend/rewrite/rewriteGraphTable.c Removing src/backend/rewrite/rewriteHandler.c.rej 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/interfaces/ecpg/test/expected/sql-sqlpgq.c Removing src/interfaces/ecpg/test/expected/sql-sqlpgq.stderr Removing src/interfaces/ecpg/test/expected/sql-sqlpgq.stdout Removing src/interfaces/ecpg/test/sql/sqlpgq.pgc Removing src/test/regress/expected/create_property_graph.out Removing src/test/regress/expected/graph_table.out Removing src/test/regress/expected/graph_table_rls.out Removing src/test/regress/sql/create_property_graph.sql Removing src/test/regress/sql/graph_table.sql Removing src/test/regress/sql/graph_table_rls.sql === using 'git apply' to apply patch ./v20260311-0001-WIP-SQL-Property-Graph-Queries-SQL-PGQ.patch === Applied patch to 'contrib/pg_overexplain/expected/pg_overexplain.out' cleanly. Applied patch to 'contrib/pg_overexplain/pg_overexplain.c' cleanly. Applied patch to 'contrib/pg_overexplain/sql/pg_overexplain.sql' 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/print.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' with conflicts. 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/acl.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/backend/utils/cache/plancache.c' cleanly. Applied patch to 'src/bin/pg_dump/common.c' cleanly. Applied patch to 'src/bin/pg_dump/dumputils.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/pgc.l' cleanly. Applied patch to 'src/interfaces/ecpg/test/ecpg_schedule' cleanly. Falling back to direct application... Falling back to direct application... Falling back to direct application... Applied patch to 'src/interfaces/ecpg/test/sql/Makefile' cleanly. Applied patch to 'src/interfaces/ecpg/test/sql/meson.build' cleanly. Falling back to direct application... Applied patch to 'src/test/regress/expected/alter_generic.out' cleanly. Falling back to direct application... 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/expected/privileges.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... Falling back to direct application... Applied patch to 'src/test/regress/sql/object_address.sql' cleanly. Applied patch to 'src/test/regress/sql/privileges.sql' cleanly. Applied patch to 'src/tools/pgindent/typedefs.list' cleanly. U src/backend/parser/analyze.c diff --cc src/backend/parser/analyze.c index 15cc6240203,dfcb7915955..00000000000 --- a/src/backend/parser/analyze.c +++ b/src/backend/parser/analyze.c @@@ -2252,8 -2249,8 +2252,13 @@@ transformSetOperationTree(ParseState *p false, &rtargetlist); ++<<<<<<< ours + constructSetOpTargetlist(pstate, op, ltargetlist, rtargetlist, targetlist, + context, recursive); ++======= + constructSetOpTargetlist(op, ltargetlist, rtargetlist, targetlist, + context, pstate, recursive); ++>>>>>>> theirs return (Node *) op; } @@@ -2265,16 -2262,15 +2270,28 @@@ * list of the given set operation. * * For every pair of columns in the targetlists of the children, compute the ++<<<<<<< ours + * common type, typmod, and collation representing the output (UNION) column. + * If targetlist is not NULL, also build the dummy output targetlist + * containing non-resjunk output columns. The values are stored into the + * given SetOperationStmt node. context is a string for error messages + * ("UNION" etc.). recursive is true if it is a recursive union. + */ +static void +constructSetOpTargetlist(ParseState *pstate, SetOperationStmt *op, + const List *ltargetlist, const List *rtargetlist, + List **targetlist, const char *context, bool recursive) ++======= + * common type, typmod, and collation representing the output (UNION) column. If + * `targetlist` is not NULL, also build the dummy output targetlist containing + * non-resjunk output columns. The values are stored into the given + * SetOperationStmt node. + */ + void + constructSetOpTargetlist(SetOperationStmt *op, List *ltargetlist, List *rtargetlist, + List **targetlist, const char *context, ParseState *pstate, + bool recursive) ++>>>>>>> theirs { ListCell *ltl; ListCell *rtl;