summaryrefslogtreecommitdiff
path: root/src/backend
diff options
context:
space:
mode:
authorPeter Eisentraut2017-03-01 17:22:33 +0000
committerPeter Eisentraut2017-03-01 17:22:33 +0000
commit005638e9886aeedeeef933bdbd123d928053d390 (patch)
tree4a58af1293a68d90c7b39ee0ae828bf849da57ca /src/backend
parent20f6d74242b3c9c84924e890248d027d30283e21 (diff)
Fix naming inconsistency
subobjid -> objsubid From: Jim Nasby <Jim.Nasby@BlueTreble.com>
Diffstat (limited to 'src/backend')
-rw-r--r--src/backend/catalog/objectaddress.c12
1 files changed, 6 insertions, 6 deletions
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