Thread

  1. [PATCH v1 3/6] Handle pg_get_indexdef default args in system_functions.sql

    Mark Wong <markwkm@gmail.com> — 2025-12-09T18:02:15Z

    Modernize pg_get_indexdef to use CREATE OR REPLACE FUNCTION to handle
    the optional column and pretty argument.
    ---
     src/backend/catalog/system_functions.sql |  7 +++++++
     src/backend/utils/adt/ruleutils.c        | 20 --------------------
     src/include/catalog/pg_proc.dat          |  5 +----
     3 files changed, 8 insertions(+), 24 deletions(-)
    
    diff --git a/src/backend/catalog/system_functions.sql b/src/backend/catalog/system_functions.sql
    index c7adfad0e05..f7b9d26089a 100644
    --- a/src/backend/catalog/system_functions.sql
    +++ b/src/backend/catalog/system_functions.sql
    @@ -678,6 +678,13 @@ LANGUAGE INTERNAL
     PARALLEL RESTRICTED
     AS 'pg_get_viewdef';
     
    +CREATE OR REPLACE FUNCTION
    +  pg_get_indexdef(view oid, "column" int DEFAULT 0, pretty bool DEFAULT false)
    +RETURNS TEXT
    +LANGUAGE INTERNAL
    +PARALLEL SAFE
    +AS 'pg_get_indexdef';
    +
     --
     -- The default permissions for functions mean that anyone can execute them.
     -- A number of functions shouldn't be executable by just anyone, but rather
    diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
    index 7d576834d5c..92e2f987074 100644
    --- a/src/backend/utils/adt/ruleutils.c
    +++ b/src/backend/utils/adt/ruleutils.c
    @@ -1114,26 +1114,6 @@ pg_get_triggerdef_worker(Oid trigid, bool pretty)
      */
     Datum
     pg_get_indexdef(PG_FUNCTION_ARGS)
    -{
    -	Oid			indexrelid = PG_GETARG_OID(0);
    -	int			prettyFlags;
    -	char	   *res;
    -
    -	prettyFlags = PRETTYFLAG_INDENT;
    -
    -	res = pg_get_indexdef_worker(indexrelid, 0, NULL,
    -								 false, false,
    -								 false, false,
    -								 prettyFlags, true);
    -
    -	if (res == NULL)
    -		PG_RETURN_NULL();
    -
    -	PG_RETURN_TEXT_P(string_to_text(res));
    -}
    -
    -Datum
    -pg_get_indexdef_ext(PG_FUNCTION_ARGS)
     {
     	Oid			indexrelid = PG_GETARG_OID(0);
     	int32		colno = PG_GETARG_INT32(1);
    diff --git a/src/include/catalog/pg_proc.dat b/src/include/catalog/pg_proc.dat
    index 2d1aa50dac6..62b997a1653 100644
    --- a/src/include/catalog/pg_proc.dat
    +++ b/src/include/catalog/pg_proc.dat
    @@ -3955,9 +3955,6 @@
     { oid => '1642', descr => 'role name by OID (with fallback)',
       proname => 'pg_get_userbyid', provolatile => 's', prorettype => 'name',
       proargtypes => 'oid', prosrc => 'pg_get_userbyid' },
    -{ oid => '1643', descr => 'index description',
    -  proname => 'pg_get_indexdef', provolatile => 's', prorettype => 'text',
    -  proargtypes => 'oid', prosrc => 'pg_get_indexdef' },
     { oid => '3415', descr => 'extended statistics object description',
       proname => 'pg_get_statisticsobjdef', provolatile => 's',
       prorettype => 'text', proargtypes => 'oid',
    @@ -8501,7 +8498,7 @@
     { oid => '2507',
       descr => 'index description (full create statement or single expression) with pretty-print option',
       proname => 'pg_get_indexdef', provolatile => 's', prorettype => 'text',
    -  proargtypes => 'oid int4 bool', prosrc => 'pg_get_indexdef_ext' },
    +  proargtypes => 'oid int4 bool', prosrc => 'pg_get_indexdef' },
     { 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' },
    -- 
    2.51.2
    
    
    --IRGsBYp1UN8d6WrT
    Content-Type: text/plain; charset=us-ascii
    Content-Disposition: attachment;
    	filename=v1-0004-Handle-pg_get_constraintdef-default-args-in-syste.patch