database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-22 23:02:54 +03:00
Code

pg_get_partkeydef: return NULL for non-partitions

Browse Source 
Our general rule for pg_get_X(oid) functions is to simply return NULL
when passed an invalid or inappropriate OID.  Teach pg_get_partkeydef to
do this also, making it easier for users to use this function when
querying against tables with both partitions and non-partitions (such as
pg_class).

As a concrete example, this makes pg_dump's life a little easier.

Author: Amit Langote
This commit is contained in:
Stephen Frost 2017-04-26 14:59:22 -04:00
parent 49da00677d
commit 0c76c2463e
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/backend/utils/adt/ruleutils.c
View File

@ -320,7 +320,7 @@ static char *pg_get_indexdef_worker(Oid indexrelid, int colno,
int prettyFlags, bool missing_ok); int prettyFlags, bool missing_ok);
static char *pg_get_statisticsext_worker(Oid statextid, bool missing_ok); static char *pg_get_statisticsext_worker(Oid statextid, bool missing_ok);
static char *pg_get_partkeydef_worker(Oid relid, int prettyFlags, static char *pg_get_partkeydef_worker(Oid relid, int prettyFlags,
bool attrsOnly); bool attrsOnly, bool missing_ok);
static char *pg_get_constraintdef_worker(Oid constraintId, bool fullCommand, static char *pg_get_constraintdef_worker(Oid constraintId, bool fullCommand,
int prettyFlags, bool missing_ok); int prettyFlags, bool missing_ok);
static text *pg_get_expr_worker(text *expr, Oid relid, const char *relname, static text *pg_get_expr_worker(text *expr, Oid relid, const char *relname,
@ -1555,10 +1555,14 @@ Datum
pg_get_partkeydef(PG_FUNCTION_ARGS) pg_get_partkeydef(PG_FUNCTION_ARGS)
{ {
Oid relid = PG_GETARG_OID(0); Oid relid = PG_GETARG_OID(0);
char *res;
PG_RETURN_TEXT_P(string_to_text(pg_get_partkeydef_worker(relid, res = pg_get_partkeydef_worker(relid, PRETTYFLAG_INDENT, false, true);
PRETTYFLAG_INDENT,
false))); if (res == NULL)
PG_RETURN_NULL();
PG_RETURN_TEXT_P(string_to_text(res));
} }
/* Internal version that just reports the column definitions */ /* Internal version that just reports the column definitions */
@ -1568,7 +1572,7 @@ pg_get_partkeydef_columns(Oid relid, bool pretty)
int prettyFlags; int prettyFlags;
prettyFlags = pretty ? PRETTYFLAG_PAREN | PRETTYFLAG_INDENT : PRETTYFLAG_INDENT; prettyFlags = pretty ? PRETTYFLAG_PAREN | PRETTYFLAG_INDENT : PRETTYFLAG_INDENT;
return pg_get_partkeydef_worker(relid, prettyFlags, true); return pg_get_partkeydef_worker(relid, prettyFlags, true, false);
} }
/* /*
@ -1576,7 +1580,7 @@ pg_get_partkeydef_columns(Oid relid, bool pretty)
*/ */
static char * static char *
pg_get_partkeydef_worker(Oid relid, int prettyFlags, pg_get_partkeydef_worker(Oid relid, int prettyFlags,
bool attrsOnly) bool attrsOnly, bool missing_ok)
{ {
Form_pg_partitioned_table form; Form_pg_partitioned_table form;
HeapTuple tuple; HeapTuple tuple;
@ -1594,7 +1598,11 @@ pg_get_partkeydef_worker(Oid relid, int prettyFlags,
tuple = SearchSysCache1(PARTRELID, ObjectIdGetDatum(relid)); tuple = SearchSysCache1(PARTRELID, ObjectIdGetDatum(relid));
if (!HeapTupleIsValid(tuple)) if (!HeapTupleIsValid(tuple))
{
if (missing_ok)
return NULL;
elog(ERROR, "cache lookup failed for partition key of %u", relid); elog(ERROR, "cache lookup failed for partition key of %u", relid);
}
form = (Form_pg_partitioned_table) GETSTRUCT(tuple); form = (Form_pg_partitioned_table) GETSTRUCT(tuple);

6
src/test/regress/expected/rules.out
View File

@ -3212,6 +3212,12 @@ SELECT pg_get_function_arg_default('pg_class'::regclass, 0);
(1 row) (1 row)
SELECT pg_get_partkeydef(0);
pg_get_partkeydef
-------------------
(1 row)
-- test rename for a rule defined on a partitioned table -- test rename for a rule defined on a partitioned table
CREATE TABLE parted_table (a int) PARTITION BY LIST (a); CREATE TABLE parted_table (a int) PARTITION BY LIST (a);
CREATE TABLE parted_table_1 PARTITION OF parted_table FOR VALUES IN (1); CREATE TABLE parted_table_1 PARTITION OF parted_table FOR VALUES IN (1);

1
src/test/regress/sql/rules.sql
View File

@ -1163,6 +1163,7 @@ SELECT pg_get_function_identity_arguments(0);
SELECT pg_get_function_result(0); SELECT pg_get_function_result(0);
SELECT pg_get_function_arg_default(0, 0); SELECT pg_get_function_arg_default(0, 0);
SELECT pg_get_function_arg_default('pg_class'::regclass, 0); SELECT pg_get_function_arg_default('pg_class'::regclass, 0);
SELECT pg_get_partkeydef(0);
-- test rename for a rule defined on a partitioned table -- test rename for a rule defined on a partitioned table
CREATE TABLE parted_table (a int) PARTITION BY LIST (a); CREATE TABLE parted_table (a int) PARTITION BY LIST (a);