=== Applying patches on top of PostgreSQL commit ID 972c14fb9134fdfd76ea6ebcf98a55a945bbc988 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Apr 15 05:25:30 UTC 2026 On branch cf/6372 nothing to commit, working tree clean === using 'git am' to apply patch ./v6-0001-Add-CREATE-XMLSCHEMA.patch === Applying: Add CREATE XMLSCHEMA Using index info to reconstruct a base tree... M doc/src/sgml/datatype.sgml M doc/src/sgml/ddl.sgml M doc/src/sgml/ref/allfiles.sgml M doc/src/sgml/ref/grant.sgml M doc/src/sgml/ref/revoke.sgml M doc/src/sgml/reference.sgml M src/backend/catalog/aclchk.c M src/backend/catalog/dependency.c M src/backend/catalog/namespace.c M src/backend/catalog/objectaddress.c 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/parser/gram.y M src/backend/tcop/utility.c M src/backend/utils/adt/acl.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/pg_dump.h M src/bin/psql/tab-complete.in.c M src/include/catalog/Makefile M src/include/catalog/meson.build M src/include/catalog/namespace.h M src/include/nodes/parsenodes.h M src/include/parser/kwlist.h M src/include/tcop/cmdtaglist.h M src/include/utils/acl.h M src/test/regress/expected/oidjoins.out M src/test/regress/expected/xml.out M src/test/regress/expected/xml_1.out M src/test/regress/expected/xml_2.out M src/test/regress/sql/xml.sql Falling back to patching base and 3-way merge... Auto-merging src/test/regress/sql/xml.sql Auto-merging src/test/regress/expected/xml_2.out Auto-merging src/test/regress/expected/xml_1.out Auto-merging src/test/regress/expected/xml.out Auto-merging src/test/regress/expected/oidjoins.out Auto-merging src/include/utils/acl.h Auto-merging src/include/tcop/cmdtaglist.h Auto-merging src/include/parser/kwlist.h Auto-merging src/include/nodes/parsenodes.h Auto-merging src/include/catalog/namespace.h Auto-merging src/include/catalog/meson.build Auto-merging src/include/catalog/Makefile Auto-merging src/bin/psql/tab-complete.in.c Auto-merging src/bin/pg_dump/pg_dump.h 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/adt/acl.c CONFLICT (content): Merge conflict in src/backend/utils/adt/acl.c Auto-merging src/backend/tcop/utility.c Auto-merging src/backend/parser/gram.y Auto-merging src/backend/commands/seclabel.c Auto-merging src/backend/commands/meson.build Auto-merging src/backend/commands/event_trigger.c Auto-merging src/backend/commands/dropcmds.c Auto-merging src/backend/commands/alter.c Auto-merging src/backend/commands/Makefile Auto-merging src/backend/catalog/objectaddress.c Auto-merging src/backend/catalog/namespace.c Auto-merging src/backend/catalog/dependency.c Auto-merging src/backend/catalog/aclchk.c CONFLICT (content): Merge conflict in src/backend/catalog/aclchk.c Auto-merging doc/src/sgml/reference.sgml Auto-merging doc/src/sgml/ref/revoke.sgml Auto-merging doc/src/sgml/ref/grant.sgml CONFLICT (content): Merge conflict in doc/src/sgml/ref/grant.sgml Auto-merging doc/src/sgml/ref/allfiles.sgml Auto-merging doc/src/sgml/ddl.sgml Auto-merging doc/src/sgml/datatype.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 Add CREATE XMLSCHEMA 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 ./v6-0001-Add-CREATE-XMLSCHEMA.patch === patching file doc/src/sgml/datatype.sgml Hunk #1 succeeded at 4660 (offset 11 lines). patching file doc/src/sgml/ddl.sgml Hunk #1 succeeded at 2497 (offset 11 lines). Hunk #2 succeeded at 2562 (offset 11 lines). Hunk #3 succeeded at 2684 (offset 11 lines). Hunk #4 succeeded at 2815 (offset 11 lines). patching file doc/src/sgml/ref/allfiles.sgml Hunk #1 succeeded at 49 (offset 1 line). Hunk #2 succeeded at 103 (offset 2 lines). Hunk #3 succeeded at 153 (offset 3 lines). patching file doc/src/sgml/ref/alter_xmlschema.sgml patching file doc/src/sgml/ref/create_xmlschema.sgml patching file doc/src/sgml/ref/drop_xmlschema.sgml patching file doc/src/sgml/ref/grant.sgml Hunk #1 succeeded at 102 (offset 5 lines). Hunk #2 FAILED at 124. 1 out of 2 hunks FAILED -- saving rejects to file doc/src/sgml/ref/grant.sgml.rej patching file doc/src/sgml/ref/revoke.sgml Hunk #1 succeeded at 132 (offset 7 lines). patching file doc/src/sgml/reference.sgml Hunk #1 succeeded at 77 (offset 1 line). Hunk #2 succeeded at 131 (offset 2 lines). Hunk #3 succeeded at 181 (offset 3 lines). patching file src/backend/catalog/Makefile patching file src/backend/catalog/aclchk.c Hunk #2 succeeded at 295 with fuzz 2 (offset 4 lines). Hunk #3 succeeded at 531 with fuzz 2 (offset -7 lines). Hunk #4 succeeded at 641 (offset -6 lines). Hunk #5 succeeded at 2706 (offset 18 lines). Hunk #6 succeeded at 2844 (offset 21 lines). patching file src/backend/catalog/dependency.c Hunk #1 succeeded at 71 (offset 5 lines). Hunk #2 succeeded at 85 (offset 5 lines). Hunk #3 succeeded at 1537 (offset 21 lines). patching file src/backend/catalog/meson.build patching file src/backend/catalog/namespace.c Hunk #2 succeeded at 4146 (offset 1 line). patching file src/backend/catalog/objectaddress.c Hunk #1 succeeded at 67 (offset 5 lines). Hunk #2 succeeded at 194 (offset 5 lines). Hunk #3 succeeded at 814 (offset 78 lines). Hunk #4 succeeded at 1136 (offset 88 lines). Hunk #5 succeeded at 2402 (offset 96 lines). Hunk #6 succeeded at 2582 (offset 97 lines). Hunk #7 succeeded at 4340 (offset 247 lines). Hunk #8 succeeded at 4986 (offset 263 lines). Hunk #9 succeeded at 6410 (offset 333 lines). patching file src/backend/catalog/pg_xmlschema.c patching file src/backend/commands/Makefile Hunk #1 succeeded at 68 (offset 2 lines). patching file src/backend/commands/alter.c Hunk #3 succeeded at 423 (offset 1 line). Hunk #4 succeeded at 569 (offset 2 lines). Hunk #5 succeeded at 880 (offset 2 lines). patching file src/backend/commands/dropcmds.c patching file src/backend/commands/event_trigger.c Hunk #1 succeeded at 2324 (offset 6 lines). Hunk #2 succeeded at 2410 (offset 7 lines). patching file src/backend/commands/meson.build Hunk #1 succeeded at 57 (offset 2 lines). patching file src/backend/commands/seclabel.c Hunk #1 succeeded at 93 (offset 1 line). patching file src/backend/commands/xmlschemacmds.c patching file src/backend/parser/gram.y Hunk #1 succeeded at 834 (offset 36 lines). Hunk #2 succeeded at 6713 (offset 59 lines). Hunk #3 succeeded at 7274 with fuzz 2 (offset 60 lines). Hunk #4 succeeded at 8198 (offset 69 lines). Hunk #5 succeeded at 10037 (offset 433 lines). Hunk #6 succeeded at 10734 (offset 443 lines). Hunk #7 succeeded at 11097 (offset 463 lines). Hunk #8 succeeded at 19224 (offset 919 lines). Hunk #9 succeeded at 19906 (offset 931 lines). patching file src/backend/tcop/utility.c Hunk #1 succeeded at 58 (offset 1 line). Hunk #2 succeeded at 1448 (offset 4 lines). Hunk #3 succeeded at 2259 (offset 13 lines). Hunk #4 succeeded at 2605 (offset 19 lines). Hunk #5 succeeded at 2809 (offset 19 lines). patching file src/backend/utils/adt/acl.c Hunk #1 succeeded at 895 with fuzz 2 (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 3862 (offset 50 lines). patching file src/bin/pg_dump/pg_dump.c Hunk #2 succeeded at 6655 (offset 103 lines). Hunk #3 succeeded at 11924 (offset 155 lines). Hunk #4 succeeded at 15453 (offset 155 lines). Hunk #5 succeeded at 20810 (offset 275 lines). patching file src/bin/pg_dump/pg_dump.h Hunk #3 succeeded at 809 (offset 5 lines). patching file src/bin/pg_dump/pg_dump_sort.c patching file src/bin/psql/tab-complete.in.c Hunk #2 succeeded at 1380 (offset 9 lines). Hunk #3 succeeded at 2752 (offset 43 lines). Hunk #4 succeeded at 4287 (offset 97 lines). patching file src/include/catalog/Makefile patching file src/include/catalog/meson.build patching file src/include/catalog/namespace.h patching file src/include/catalog/pg_xmlschema.h patching file src/include/commands/xmlschemacmds.h patching file src/include/nodes/parsenodes.h Hunk #1 succeeded at 2481 (offset 78 lines). patching file src/include/parser/kwlist.h Hunk #1 succeeded at 531 (offset 11 lines). patching file src/include/tcop/cmdtaglist.h Hunk #2 succeeded at 90 (offset 1 line). Hunk #3 succeeded at 144 (offset 2 lines). patching file src/include/utils/acl.h Hunk #1 succeeded at 170 (offset 1 line). patching file src/test/regress/expected/oidjoins.out Hunk #1 succeeded at 240 (offset 1 line). patching file src/test/regress/expected/xml.out Hunk #1 succeeded at 1879 (offset -2 lines). patching file src/test/regress/expected/xml_1.out Hunk #1 succeeded at 1494 (offset -2 lines). patching file src/test/regress/expected/xml_2.out Hunk #7 succeeded at 1879 (offset -2 lines). patching file src/test/regress/sql/xml.sql Hunk #1 succeeded at 677 (offset -2 lines). Unstaged changes after reset: M doc/src/sgml/datatype.sgml M doc/src/sgml/ddl.sgml M doc/src/sgml/ref/allfiles.sgml M doc/src/sgml/ref/grant.sgml M doc/src/sgml/ref/revoke.sgml M doc/src/sgml/reference.sgml M src/backend/catalog/Makefile M src/backend/catalog/aclchk.c M src/backend/catalog/dependency.c M src/backend/catalog/meson.build M src/backend/catalog/namespace.c M src/backend/catalog/objectaddress.c 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/parser/gram.y M src/backend/tcop/utility.c M src/backend/utils/adt/acl.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/pg_dump.h M src/bin/pg_dump/pg_dump_sort.c M src/bin/psql/tab-complete.in.c M src/include/catalog/Makefile M src/include/catalog/meson.build M src/include/catalog/namespace.h M src/include/nodes/parsenodes.h M src/include/parser/kwlist.h M src/include/tcop/cmdtaglist.h M src/include/utils/acl.h M src/test/regress/expected/oidjoins.out M src/test/regress/expected/xml.out M src/test/regress/expected/xml_1.out M src/test/regress/expected/xml_2.out M src/test/regress/sql/xml.sql Removing doc/src/sgml/ref/alter_xmlschema.sgml Removing doc/src/sgml/ref/create_xmlschema.sgml Removing doc/src/sgml/ref/drop_xmlschema.sgml Removing doc/src/sgml/ref/grant.sgml.rej Removing src/backend/catalog/pg_xmlschema.c Removing src/backend/commands/xmlschemacmds.c Removing src/include/catalog/pg_xmlschema.h Removing src/include/commands/xmlschemacmds.h === using 'git apply' to apply patch ./v6-0001-Add-CREATE-XMLSCHEMA.patch === Applied patch to 'doc/src/sgml/datatype.sgml' cleanly. Applied patch to 'doc/src/sgml/ddl.sgml' cleanly. Applied patch to 'doc/src/sgml/ref/allfiles.sgml' cleanly. Falling back to direct application... Falling back to direct application... Falling back to direct application... Applied patch to 'doc/src/sgml/ref/grant.sgml' with conflicts. Applied patch to 'doc/src/sgml/ref/revoke.sgml' cleanly. Applied patch to 'doc/src/sgml/reference.sgml' cleanly. Applied patch to 'src/backend/catalog/Makefile' 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/meson.build' cleanly. Applied patch to 'src/backend/catalog/namespace.c' cleanly. Applied patch to 'src/backend/catalog/objectaddress.c' cleanly. Falling back to direct application... 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. Applied patch to 'src/backend/commands/seclabel.c' cleanly. Falling back to direct application... Applied patch to 'src/backend/parser/gram.y' cleanly. Applied patch to 'src/backend/tcop/utility.c' cleanly. Applied patch to 'src/backend/utils/adt/acl.c' with conflicts. 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/pg_dump.h' cleanly. Applied patch to 'src/bin/pg_dump/pg_dump_sort.c' cleanly. Applied patch to 'src/bin/psql/tab-complete.in.c' cleanly. Applied patch to 'src/include/catalog/Makefile' cleanly. Applied patch to 'src/include/catalog/meson.build' cleanly. Applied patch to 'src/include/catalog/namespace.h' cleanly. Falling back to direct application... Falling back to direct application... Applied patch to 'src/include/nodes/parsenodes.h' cleanly. Applied patch to 'src/include/parser/kwlist.h' cleanly. Applied patch to 'src/include/tcop/cmdtaglist.h' cleanly. Applied patch to 'src/include/utils/acl.h' cleanly. Applied patch to 'src/test/regress/expected/oidjoins.out' cleanly. Applied patch to 'src/test/regress/expected/xml.out' cleanly. Applied patch to 'src/test/regress/expected/xml_1.out' cleanly. Applied patch to 'src/test/regress/expected/xml_2.out' cleanly. Applied patch to 'src/test/regress/sql/xml.sql' cleanly. U doc/src/sgml/ref/grant.sgml U src/backend/catalog/aclchk.c U src/backend/utils/adt/acl.c diff --cc doc/src/sgml/ref/grant.sgml index 67426d42285,28345bc2215..00000000000 --- a/doc/src/sgml/ref/grant.sgml +++ b/doc/src/sgml/ref/grant.sgml @@@ -124,7 -124,7 +129,11 @@@ GRANT ro that grants privileges on a database object (table, column, view, foreign table, sequence, database, foreign-data wrapper, foreign server, function, procedure, procedural language, large object, configuration ++<<<<<<< ours + parameter, property graph, schema, tablespace, or type), and one that grants ++======= + parameter, schema, tablespace, type, or XML schema), and one that grants ++>>>>>>> theirs membership in a role. These variants are similar in many ways, but they are different enough to be described separately. diff --cc src/backend/catalog/aclchk.c index 67424fe3b0c,fbc96176df5..00000000000 --- a/src/backend/catalog/aclchk.c +++ b/src/backend/catalog/aclchk.c @@@ -291,8 -291,8 +292,13 @@@ restrict_and_check_grant(bool is_grant case OBJECT_PARAMETER_ACL: whole_mask = ACL_ALL_RIGHTS_PARAMETER_ACL; break; ++<<<<<<< ours + case OBJECT_PROPGRAPH: + whole_mask = ACL_ALL_RIGHTS_PROPGRAPH; ++======= + case OBJECT_XMLSCHEMA: + whole_mask = ACL_ALL_RIGHTS_XMLSCHEMA; ++>>>>>>> theirs break; default: elog(ERROR, "unrecognized object type: %d", objtype); @@@ -523,9 -538,9 +529,15 @@@ ExecuteGrantStmt(GrantStmt *stmt all_privileges = ACL_ALL_RIGHTS_PARAMETER_ACL; errormsg = gettext_noop("invalid privilege type %s for parameter"); break; ++<<<<<<< ours + case OBJECT_PROPGRAPH: + all_privileges = ACL_ALL_RIGHTS_PROPGRAPH; + errormsg = gettext_noop("invalid privilege type %s for property graph"); ++======= + case OBJECT_XMLSCHEMA: + all_privileges = ACL_ALL_RIGHTS_XMLSCHEMA; + errormsg = gettext_noop("invalid privilege type %s for XML schema"); ++>>>>>>> theirs break; default: elog(ERROR, "unrecognized GrantStmt.objtype: %d", diff --cc src/backend/utils/adt/acl.c index 01caa12eca7,c6eb6418dbb..00000000000 --- a/src/backend/utils/adt/acl.c +++ b/src/backend/utils/adt/acl.c @@@ -891,9 -868,9 +891,15 @@@ acldefault(ObjectType objtype, Oid owne world_default = ACL_NO_RIGHTS; owner_default = ACL_ALL_RIGHTS_PARAMETER_ACL; break; ++<<<<<<< ours + case OBJECT_PROPGRAPH: + world_default = ACL_NO_RIGHTS; + owner_default = ACL_ALL_RIGHTS_PROPGRAPH; ++======= + case OBJECT_XMLSCHEMA: + world_default = ACL_NO_RIGHTS; + owner_default = ACL_ALL_RIGHTS_XMLSCHEMA; ++>>>>>>> theirs break; default: elog(ERROR, "unrecognized object type: %d", (int) objtype);