Fix naming inconsistency
subobjid -> objsubid From: Jim Nasby <Jim.Nasby@BlueTreble.com>
This commit is contained in:
parent
20f6d74242
commit
005638e988
|
@ -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
|
||||
|
|
|
@ -53,6 +53,6 @@
|
|||
*/
|
||||
|
||||
/* yyyymmddN */
|
||||
#define CATALOG_VERSION_NO 201702231
|
||||
#define CATALOG_VERSION_NO 201703011
|
||||
|
||||
#endif
|
||||
|
|
|
@ -3096,13 +3096,13 @@ DESCR("get transaction Id and commit timestamp of latest transaction commit");
|
|||
DATA(insert OID = 3537 ( pg_describe_object PGNSP PGUID 12 1 0 0 0 f f f f t f s s 3 0 25 "26 26 23" _null_ _null_ _null_ _null_ _null_ pg_describe_object _null_ _null_ _null_ ));
|
||||
DESCR("get identification of SQL object");
|
||||
|
||||
DATA(insert OID = 3839 ( pg_identify_object PGNSP PGUID 12 1 0 0 0 f f f f t f s s 3 0 2249 "26 26 23" "{26,26,23,25,25,25,25}" "{i,i,i,o,o,o,o}" "{classid,objid,subobjid,type,schema,name,identity}" _null_ _null_ pg_identify_object _null_ _null_ _null_ ));
|
||||
DATA(insert OID = 3839 ( pg_identify_object PGNSP PGUID 12 1 0 0 0 f f f f t f s s 3 0 2249 "26 26 23" "{26,26,23,25,25,25,25}" "{i,i,i,o,o,o,o}" "{classid,objid,objsubid,type,schema,name,identity}" _null_ _null_ pg_identify_object _null_ _null_ _null_ ));
|
||||
DESCR("get machine-parseable identification of SQL object");
|
||||
|
||||
DATA(insert OID = 3382 ( pg_identify_object_as_address PGNSP PGUID 12 1 0 0 0 f f f f t f s s 3 0 2249 "26 26 23" "{26,26,23,25,1009,1009}" "{i,i,i,o,o,o}" "{classid,objid,subobjid,type,object_names,object_args}" _null_ _null_ pg_identify_object_as_address _null_ _null_ _null_ ));
|
||||
DATA(insert OID = 3382 ( pg_identify_object_as_address PGNSP PGUID 12 1 0 0 0 f f f f t f s s 3 0 2249 "26 26 23" "{26,26,23,25,1009,1009}" "{i,i,i,o,o,o}" "{classid,objid,objsubid,type,object_names,object_args}" _null_ _null_ pg_identify_object_as_address _null_ _null_ _null_ ));
|
||||
DESCR("get identification of SQL object for pg_get_object_address()");
|
||||
|
||||
DATA(insert OID = 3954 ( pg_get_object_address PGNSP PGUID 12 1 0 0 0 f f f f t f s s 3 0 2249 "25 1009 1009" "{25,1009,1009,26,26,23}" "{i,i,i,o,o,o}" "{type,name,args,classid,objid,subobjid}" _null_ _null_ pg_get_object_address _null_ _null_ _null_ ));
|
||||
DATA(insert OID = 3954 ( pg_get_object_address PGNSP PGUID 12 1 0 0 0 f f f f t f s s 3 0 2249 "25 1009 1009" "{25,1009,1009,26,26,23}" "{i,i,i,o,o,o}" "{type,name,args,classid,objid,objsubid}" _null_ _null_ pg_get_object_address _null_ _null_ _null_ ));
|
||||
DESCR("get OID-based object address from name/args arrays");
|
||||
|
||||
DATA(insert OID = 2079 ( pg_table_is_visible PGNSP PGUID 12 10 0 0 0 f f f f t f s s 1 0 16 "26" _null_ _null_ _null_ _null_ _null_ pg_table_is_visible _null_ _null_ _null_ ));
|
||||
|
|
|
@ -401,14 +401,14 @@ WITH objects (type, name, args) AS (VALUES
|
|||
('publication relation', '{addr_nsp, gentable}', '{addr_pub}'),
|
||||
('subscription', '{addr_sub}', '{}')
|
||||
)
|
||||
SELECT (pg_identify_object(addr1.classid, addr1.objid, addr1.subobjid)).*,
|
||||
SELECT (pg_identify_object(addr1.classid, addr1.objid, addr1.objsubid)).*,
|
||||
-- test roundtrip through pg_identify_object_as_address
|
||||
ROW(pg_identify_object(addr1.classid, addr1.objid, addr1.subobjid)) =
|
||||
ROW(pg_identify_object(addr2.classid, addr2.objid, addr2.subobjid))
|
||||
ROW(pg_identify_object(addr1.classid, addr1.objid, addr1.objsubid)) =
|
||||
ROW(pg_identify_object(addr2.classid, addr2.objid, addr2.objsubid))
|
||||
FROM objects, pg_get_object_address(type, name, args) addr1,
|
||||
pg_identify_object_as_address(classid, objid, subobjid) ioa(typ,nms,args),
|
||||
pg_identify_object_as_address(classid, objid, objsubid) ioa(typ,nms,args),
|
||||
pg_get_object_address(typ, nms, ioa.args) as addr2
|
||||
ORDER BY addr1.classid, addr1.objid, addr1.subobjid;
|
||||
ORDER BY addr1.classid, addr1.objid, addr1.objsubid;
|
||||
type | schema | name | identity | ?column?
|
||||
---------------------------+------------+-------------------+----------------------------------------------------------------------+----------
|
||||
default acl | | | for role regress_addr_user in schema public on tables | t
|
||||
|
|
|
@ -181,14 +181,14 @@ WITH objects (type, name, args) AS (VALUES
|
|||
('publication relation', '{addr_nsp, gentable}', '{addr_pub}'),
|
||||
('subscription', '{addr_sub}', '{}')
|
||||
)
|
||||
SELECT (pg_identify_object(addr1.classid, addr1.objid, addr1.subobjid)).*,
|
||||
SELECT (pg_identify_object(addr1.classid, addr1.objid, addr1.objsubid)).*,
|
||||
-- test roundtrip through pg_identify_object_as_address
|
||||
ROW(pg_identify_object(addr1.classid, addr1.objid, addr1.subobjid)) =
|
||||
ROW(pg_identify_object(addr2.classid, addr2.objid, addr2.subobjid))
|
||||
ROW(pg_identify_object(addr1.classid, addr1.objid, addr1.objsubid)) =
|
||||
ROW(pg_identify_object(addr2.classid, addr2.objid, addr2.objsubid))
|
||||
FROM objects, pg_get_object_address(type, name, args) addr1,
|
||||
pg_identify_object_as_address(classid, objid, subobjid) ioa(typ,nms,args),
|
||||
pg_identify_object_as_address(classid, objid, objsubid) ioa(typ,nms,args),
|
||||
pg_get_object_address(typ, nms, ioa.args) as addr2
|
||||
ORDER BY addr1.classid, addr1.objid, addr1.subobjid;
|
||||
ORDER BY addr1.classid, addr1.objid, addr1.objsubid;
|
||||
|
||||
---
|
||||
--- Cleanup resources
|
||||
|
|
Loading…
Reference in New Issue