From 005638e9886aeedeeef933bdbd123d928053d390 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Wed, 1 Mar 2017 12:22:33 -0500 Subject: Fix naming inconsistency subobjid -> objsubid From: Jim Nasby --- src/backend/catalog/objectaddress.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/backend') diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index cc636e2e3ed..2704aaeb4e6 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -3468,7 +3468,7 @@ pg_describe_object(PG_FUNCTION_ARGS) { Oid classid = PG_GETARG_OID(0); Oid objid = PG_GETARG_OID(1); - int32 subobjid = PG_GETARG_INT32(2); + int32 objsubid = PG_GETARG_INT32(2); char *description; ObjectAddress address; @@ -3478,7 +3478,7 @@ pg_describe_object(PG_FUNCTION_ARGS) address.classId = classid; address.objectId = objid; - address.objectSubId = subobjid; + address.objectSubId = objsubid; description = getObjectDescription(&address); PG_RETURN_TEXT_P(cstring_to_text(description)); @@ -3492,7 +3492,7 @@ pg_identify_object(PG_FUNCTION_ARGS) { Oid classid = PG_GETARG_OID(0); Oid objid = PG_GETARG_OID(1); - int32 subobjid = PG_GETARG_INT32(2); + int32 objsubid = PG_GETARG_INT32(2); Oid schema_oid = InvalidOid; const char *objname = NULL; ObjectAddress address; @@ -3503,7 +3503,7 @@ pg_identify_object(PG_FUNCTION_ARGS) address.classId = classid; address.objectId = objid; - address.objectSubId = subobjid; + address.objectSubId = objsubid; /* * Construct a tuple descriptor for the result row. This must match this @@ -3608,7 +3608,7 @@ pg_identify_object_as_address(PG_FUNCTION_ARGS) { Oid classid = PG_GETARG_OID(0); Oid objid = PG_GETARG_OID(1); - int32 subobjid = PG_GETARG_INT32(2); + int32 objsubid = PG_GETARG_INT32(2); ObjectAddress address; char *identity; List *names; @@ -3620,7 +3620,7 @@ pg_identify_object_as_address(PG_FUNCTION_ARGS) address.classId = classid; address.objectId = objid; - address.objectSubId = subobjid; + address.objectSubId = objsubid; /* * Construct a tuple descriptor for the result row. This must match this -- cgit v1.2.3