diff options
| author | Peter Eisentraut | 2017-03-01 17:22:33 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2017-03-01 17:22:33 +0000 |
| commit | 005638e9886aeedeeef933bdbd123d928053d390 (patch) | |
| tree | 4a58af1293a68d90c7b39ee0ae828bf849da57ca /src/test | |
| parent | 20f6d74242b3c9c84924e890248d027d30283e21 (diff) | |
Fix naming inconsistency
subobjid -> objsubid
From: Jim Nasby <Jim.Nasby@BlueTreble.com>
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/regress/expected/object_address.out | 10 | ||||
| -rw-r--r-- | src/test/regress/sql/object_address.sql | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/test/regress/expected/object_address.out b/src/test/regress/expected/object_address.out index 4766975746..71f16fd90a 100644 --- a/src/test/regress/expected/object_address.out +++ b/src/test/regress/expected/object_address.out @@ -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 diff --git a/src/test/regress/sql/object_address.sql b/src/test/regress/sql/object_address.sql index e658ea346d..0ace4dd425 100644 --- a/src/test/regress/sql/object_address.sql +++ b/src/test/regress/sql/object_address.sql @@ -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 |