git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c

index cc636e2e3ed775011fb5ce02ed6b2beff6b63ffc..2704aaeb4e6b2882dc7f027e8a8c05f10a347bbe 100644 (file)

--- a/src/backend/catalog/objectaddress.c

+++ b/src/backend/catalog/objectaddress.c

{

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;

address.classId = classid;

address.objectId = objid;

- address.objectSubId = subobjid;

+ address.objectSubId = objsubid;

description = getObjectDescription(&address);

PG_RETURN_TEXT_P(cstring_to_text(description));

{

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;

address.classId = classid;

address.objectId = objid;

- address.objectSubId = subobjid;

+ address.objectSubId = objsubid;

/*

* Construct a tuple descriptor for the result row. This must match this

{

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;

address.classId = classid;

address.objectId = objid;

- address.objectSubId = subobjid;

+ address.objectSubId = objsubid;

/*

* Construct a tuple descriptor for the result row. This must match this

diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h

index 9e8c1c2a027c83d31c0e32c6238b2668a8be368b..90456fa668f4454306d643263724097cca2ce075 100644 (file)

--- a/src/include/catalog/catversion.h

+++ b/src/include/catalog/catversion.h

*/

/* yyyymmddN */

-#define CATALOG_VERSION_NO 201702231

+#define CATALOG_VERSION_NO 201703011

#endif

diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h

index a4cc86d3221396eb83f699c8ea7c36076dce6a6d..4b9c6e75b0529d9145764b372e507c748cc30bb2 100644 (file)

--- a/src/include/catalog/pg_proc.h

+++ b/src/include/catalog/pg_proc.h

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_ ));

diff --git a/src/test/regress/expected/object_address.out b/src/test/regress/expected/object_address.out

index 4766975746d66a190c48f67327c3267775b4fa2d..71f16fd90a3ff20bb77fd5773ee7a2156af06bfd 100644 (file)

--- a/src/test/regress/expected/object_address.out

+++ b/src/test/regress/expected/object_address.out

('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

diff --git a/src/test/regress/sql/object_address.sql b/src/test/regress/sql/object_address.sql

index e658ea346dd7471fab544a86ebf0ef53c29ecb7f..0ace4dd42554277892d0174e51718e99793b3287 100644 (file)

--- a/src/test/regress/sql/object_address.sql

+++ b/src/test/regress/sql/object_address.sql

('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