=== Applying patches on top of PostgreSQL commit ID 901ed9b352b41f034e17bc540725082a488fce31 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sun May 10 00:53:22 UTC 2026
On branch cf/6212
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v10-0001-Add-pg_get_domain_ddl-function-to-reconstruct-CR.patch ===
Applying: Add pg_get_domain_ddl() function to reconstruct CREATE DOMAIN statements
Using index info to reconstruct a base tree...
M	doc/src/sgml/func/func-info.sgml
M	src/backend/catalog/system_functions.sql
M	src/backend/utils/adt/ruleutils.c
M	src/include/catalog/pg_proc.dat
M	src/test/regress/expected/event_trigger.out
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/expected/event_trigger.out
Auto-merging src/include/catalog/pg_proc.dat
CONFLICT (content): Merge conflict in src/include/catalog/pg_proc.dat
Auto-merging src/backend/utils/adt/ruleutils.c
Auto-merging src/backend/catalog/system_functions.sql
Auto-merging doc/src/sgml/func/func-info.sgml
CONFLICT (content): Merge conflict in doc/src/sgml/func/func-info.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 pg_get_domain_ddl() function to reconstruct CREATE DOMAIN statements
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 ./v10-0001-Add-pg_get_domain_ddl-function-to-reconstruct-CR.patch ===
patching file doc/src/sgml/func/func-info.sgml
Hunk #1 succeeded at 3967 (offset 122 lines).
patching file src/backend/catalog/system_functions.sql
Hunk #1 succeeded at 366 (offset -6 lines).
patching file src/backend/utils/adt/ruleutils.c
Hunk #1 succeeded at 99 (offset 5 lines).
Hunk #2 succeeded at 562 (offset 10 lines).
Hunk #3 succeeded at 14374 (offset 604 lines).
patching file src/include/catalog/pg_proc.dat
Hunk #1 FAILED at 8585.
1 out of 1 hunk FAILED -- saving rejects to file src/include/catalog/pg_proc.dat.rej
patching file src/test/regress/expected/domain.out
patching file src/test/regress/expected/event_trigger.out
patching file src/test/regress/expected/test_setup.out
patching file src/test/regress/sql/domain.sql
patching file src/test/regress/sql/test_setup.sql
Unstaged changes after reset:
M	doc/src/sgml/func/func-info.sgml
M	src/backend/catalog/system_functions.sql
M	src/backend/utils/adt/ruleutils.c
M	src/test/regress/expected/domain.out
M	src/test/regress/expected/event_trigger.out
M	src/test/regress/expected/test_setup.out
M	src/test/regress/sql/domain.sql
M	src/test/regress/sql/test_setup.sql
Removing src/include/catalog/pg_proc.dat.rej
=== using 'git apply' to apply patch ./v10-0001-Add-pg_get_domain_ddl-function-to-reconstruct-CR.patch ===
Applied patch to 'doc/src/sgml/func/func-info.sgml' with conflicts.
Applied patch to 'src/backend/catalog/system_functions.sql' cleanly.
Applied patch to 'src/backend/utils/adt/ruleutils.c' cleanly.
Applied patch to 'src/include/catalog/pg_proc.dat' with conflicts.
Applied patch to 'src/test/regress/expected/domain.out' cleanly.
Applied patch to 'src/test/regress/expected/event_trigger.out' cleanly.
Applied patch to 'src/test/regress/expected/test_setup.out' cleanly.
Applied patch to 'src/test/regress/sql/domain.sql' cleanly.
Applied patch to 'src/test/regress/sql/test_setup.sql' cleanly.
U doc/src/sgml/func/func-info.sgml
U src/include/catalog/pg_proc.dat
diff --cc doc/src/sgml/func/func-info.sgml
index 00f64f50ceb,eb128fede09..00000000000
--- a/doc/src/sgml/func/func-info.sgml
+++ b/doc/src/sgml/func/func-info.sgml
@@@ -3865,12 -3850,9 +3865,18 @@@ acl      | {postgres=arwdDxtm/postgres,
  
     <para>
      The functions shown in <xref linkend="functions-get-object-ddl-table"/>
++<<<<<<< ours
 +    reconstruct DDL statements for various global database objects.
 +    Each function returns a set of text rows, one SQL statement per row.
 +    (This is a decompiled reconstruction, not the original text of the
 +    command.)  Functions that accept <literal>VARIADIC</literal> options
 +    take alternating name/value text pairs; values are parsed as boolean,
 +    integer or text.
++=======
+     print the DDL statements for various database objects.
+     (This is a decompiled reconstruction, not the original text
+     of the command.)
++>>>>>>> theirs
     </para>
  
     <table id="functions-get-object-ddl-table">
@@@ -3891,74 -3873,23 +3897,94 @@@
        <row>
         <entry role="func_table_entry"><para role="func_signature">
          <indexterm>
++<<<<<<< ours
 +         <primary>pg_get_role_ddl</primary>
 +        </indexterm>
 +        <function>pg_get_role_ddl</function>
 +        ( <parameter>role</parameter> <type>regrole</type>
 +        <optional>, <literal>VARIADIC</literal> <parameter>options</parameter>
 +        <type>text</type> </optional> )
 +        <returnvalue>setof text</returnvalue>
 +       </para>
 +       <para>
 +        Reconstructs the <command>CREATE ROLE</command> statement and any
 +        <command>ALTER ROLE ... SET</command> statements for the given role.
 +        Each statement is returned as a separate row.
 +        Password information is never included in the output.
 +        The following options are supported: <literal>pretty</literal> (boolean)
 +        for pretty-printed output and <literal>memberships</literal> (boolean,
 +        default true) to include <command>GRANT</command> statements for
 +        role memberships and their options.
 +       </para></entry>
 +      </row>
 +      <row>
 +       <entry role="func_table_entry"><para role="func_signature">
 +        <indexterm>
 +         <primary>pg_get_tablespace_ddl</primary>
 +        </indexterm>
 +        <function>pg_get_tablespace_ddl</function>
 +        ( <parameter>tablespace</parameter> <type>oid</type>
 +        <optional>, <literal>VARIADIC</literal> <parameter>options</parameter>
 +        <type>text</type> </optional> )
 +        <returnvalue>setof text</returnvalue>
 +       </para>
 +       <para role="func_signature">
 +        <function>pg_get_tablespace_ddl</function>
 +        ( <parameter>tablespace</parameter> <type>name</type>
 +        <optional>, <literal>VARIADIC</literal> <parameter>options</parameter>
 +        <type>text</type> </optional> )
 +        <returnvalue>setof text</returnvalue>
 +       </para>
 +       <para>
 +        Reconstructs the <command>CREATE TABLESPACE</command> statement for
 +        the specified tablespace (by OID or name).  If the tablespace has
 +        options set, an <command>ALTER TABLESPACE ... SET</command> statement
 +        is also returned.  Each statement is returned as a separate row.
 +        The following options are supported: <literal>pretty</literal> (boolean)
 +        for formatted output and <literal>owner</literal> (boolean) to include
 +        <literal>OWNER</literal>.
 +       </para></entry>
 +      </row>
 +      <row>
 +       <entry role="func_table_entry"><para role="func_signature">
 +        <indexterm>
 +         <primary>pg_get_database_ddl</primary>
 +        </indexterm>
 +        <function>pg_get_database_ddl</function>
 +        ( <parameter>database</parameter> <type>regdatabase</type>
 +        <optional>, <literal>VARIADIC</literal> <parameter>options</parameter>
 +        <type>text</type> </optional> )
 +        <returnvalue>setof text</returnvalue>
 +       </para>
 +       <para>
 +        Reconstructs the <command>CREATE DATABASE</command> statement for the
 +        specified database, followed by <command>ALTER DATABASE</command>
 +        statements for connection limit, template status, and configuration
 +        settings.  Each statement is returned as a separate row.
 +        The following options are supported:
 +        <literal>pretty</literal> (boolean) for formatted output,
 +        <literal>owner</literal> (boolean) to include <literal>OWNER</literal>,
 +        and <literal>tablespace</literal> (boolean) to include
 +        <literal>TABLESPACE</literal>.
++=======
+          <primary>pg_get_domain_ddl</primary>
+         </indexterm>
+         <function>pg_get_domain_ddl</function> ( <parameter>domain</parameter> <type>regtype</type>
+          <optional>, <parameter>pretty</parameter> <type>boolean</type> </optional>)
+         <returnvalue>text</returnvalue>
+        </para>
+        <para>
+         Reconstructs the creating command for a domain.
+         The result is a complete <command>CREATE DOMAIN</command> statement.
+        </para>
+        <para>
+         The <parameter>domain</parameter> parameter uses type <type>regtype</type>,
+         which follows the standard <varname>search_path</varname> for type name
+         resolution. If a domain name conflicts with a built-in type name
+         (for example, a domain named <literal>int</literal>), you must use a
+         schema-qualified name (for example, <literal>'public.int'::regtype</literal>)
+         to reference the domain.
++>>>>>>> theirs
         </para></entry>
        </row>
       </tbody>
diff --cc src/include/catalog/pg_proc.dat
index fa9ae79082b,f2ad869b1b8..00000000000
--- a/src/include/catalog/pg_proc.dat
+++ b/src/include/catalog/pg_proc.dat
@@@ -8616,38 -8585,9 +8616,44 @@@
  { oid => '2508', descr => 'constraint description with pretty-print option',
    proname => 'pg_get_constraintdef', provolatile => 's', prorettype => 'text',
    proargtypes => 'oid bool', prosrc => 'pg_get_constraintdef_ext' },
++<<<<<<< ours
 +{ oid => '8760', descr => 'get DDL to recreate a role',
 +  proname => 'pg_get_role_ddl', provariadic => 'text', proisstrict => 'f',
 +  provolatile => 's', proretset => 't', prorows => '10', prorettype => 'text',
 +  proargtypes => 'regrole text',
 +  proargmodes => '{i,v}',
 +  proallargtypes => '{regrole,text}',
 +  pronargdefaults => '1', proargdefaults => '{NULL}',
 +  prosrc => 'pg_get_role_ddl' },
 +{ oid => '8758', descr => 'get DDL to recreate a tablespace',
 +  proname => 'pg_get_tablespace_ddl', provariadic => 'text', proisstrict => 'f',
 +  provolatile => 's', proretset => 't', prorows => '10', prorettype => 'text',
 +  proargtypes => 'oid text',
 +  proargmodes => '{i,v}',
 +  proallargtypes => '{oid,text}',
 +  pronargdefaults => '1', proargdefaults => '{NULL}',
 +  prosrc => 'pg_get_tablespace_ddl_oid' },
 +{ oid => '8759', descr => 'get DDL to recreate a tablespace',
 +  proname => 'pg_get_tablespace_ddl', provariadic => 'text', proisstrict => 'f',
 +  provolatile => 's', proretset => 't', prorows => '10', prorettype => 'text',
 +  proargtypes => 'name text',
 +  proargmodes => '{i,v}',
 +  proallargtypes => '{name,text}',
 +  pronargdefaults => '1', proargdefaults => '{NULL}',
 +  prosrc => 'pg_get_tablespace_ddl_name' },
 +{ oid => '8762', descr => 'get DDL to recreate a database',
 +  proname => 'pg_get_database_ddl', provariadic => 'text', proisstrict => 'f',
 +  provolatile => 's', proretset => 't', prorows => '10', prorettype => 'text',
 +  proargtypes => 'regdatabase text',
 +  proargmodes => '{i,v}',
 +  proallargtypes => '{regdatabase,text}',
 +  pronargdefaults => '1', proargdefaults => '{NULL}',
 +  prosrc => 'pg_get_database_ddl' },
++=======
+ { oid => '8024', descr => 'get CREATE statement for DOMAIN with pretty option',
+   proname => 'pg_get_domain_ddl', provolatile => 's', prorettype => 'text',
+   proargtypes => 'regtype bool', prosrc => 'pg_get_domain_ddl_ext' },
++>>>>>>> theirs
  { oid => '2509',
    descr => 'deparse an encoded expression with pretty-print option',
    proname => 'pg_get_expr', provolatile => 's', prorettype => 'text',