Skip to content

Commit 3f88672

Browse files
alvherrealvherre
committed
Use TypeName to represent type names in certain commands
In COMMENT, DROP, SECURITY LABEL, and the new pg_get_object_address function, we were representing types as a list of names, same as other objects; but types are special objects that require their own representation to be totally accurate. In the original COMMENT code we had a note about fixing it which was lost in the course of c10575f. Change all those places to use TypeName instead, as suggested by that comment. Right now the original coding doesn't cause any bugs, so no backpatch. It is more problematic for proposed future code that operate with object addresses from the SQL interface; type details such as array-ness are lost when working with the degraded representation. Thanks to Petr Jelínek and Dimitri Fontaine for offlist help on finding a solution to a shift/reduce grammar conflict.
1 parent 930fd68 commit 3f88672

File tree

4 files changed

+107
-48
lines changed

4 files changed

+107
-48
lines changed

‎src/backend/catalog/objectaddress.c‎

Lines changed: 8 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -646,13 +646,11 @@ get_object_address(ObjectType objtype, List *objname, List *objargs,
646646
break;
647647
case OBJECT_DOMCONSTRAINT:
648648
{
649-
List *domname;
650649
ObjectAddress domaddr;
651650
char *constrname;
652651

653-
domname = list_truncate(list_copy(objname), list_length(objname) - 1);
654-
constrname = strVal(llast(objname));
655-
domaddr = get_object_address_type(OBJECT_DOMAIN, domname, missing_ok);
652+
domaddr = get_object_address_type(OBJECT_DOMAIN, objname, missing_ok);
653+
constrname = strVal(linitial(objargs));
656654

657655
address.classId = ConstraintRelationId;
658656
address.objectId = get_domain_constraint_oid(domaddr.objectId,
@@ -1291,14 +1289,13 @@ get_object_address_attrdef(ObjectType objtype, List *objname,
12911289
* Find the ObjectAddress for a type or domain
12921290
*/
12931291
static ObjectAddress
1294-
get_object_address_type(ObjectType objtype,
1295-
List *objname, bool missing_ok)
1292+
get_object_address_type(ObjectType objtype, List *objname, bool missing_ok)
12961293
{
12971294
ObjectAddress address;
12981295
TypeName *typename;
12991296
Type tup;
13001297

1301-
typename = makeTypeNameFromNameList(objname);
1298+
typename = (TypeName *) linitial(objname);
13021299

13031300
address.classId = TypeRelationId;
13041301
address.objectId = InvalidOid;
@@ -1428,27 +1425,8 @@ pg_get_object_address(PG_FUNCTION_ARGS)
14281425
* given object type. Most use a simple string Values list, but there
14291426
* are some exceptions.
14301427
*/
1431-
if (type == OBJECT_TYPE || type == OBJECT_DOMAIN)
1432-
{
1433-
Datum *elems;
1434-
bool *nulls;
1435-
int nelems;
1436-
TypeName *typname;
1437-
1438-
deconstruct_array(namearr, TEXTOID, -1, false, 'i',
1439-
&elems, &nulls, &nelems);
1440-
if (nelems != 1)
1441-
ereport(ERROR,
1442-
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
1443-
errmsg("name list length must be exactly %d", 1)));
1444-
if (nulls[0])
1445-
ereport(ERROR,
1446-
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
1447-
errmsg("name or argument lists may not contain nulls")));
1448-
typname = typeStringToTypeName(TextDatumGetCString(elems[0]));
1449-
name = typname->names;
1450-
}
1451-
else if (type == OBJECT_CAST)
1428+
if (type == OBJECT_TYPE || type == OBJECT_DOMAIN || type == OBJECT_CAST ||
1429+
type == OBJECT_DOMCONSTRAINT)
14521430
{
14531431
Datum *elems;
14541432
bool *nulls;
@@ -1533,18 +1511,13 @@ pg_get_object_address(PG_FUNCTION_ARGS)
15331511
*/
15341512
switch (type)
15351513
{
1536-
case OBJECT_DOMCONSTRAINT:
1537-
if (list_length(name) < 2)
1538-
ereport(ERROR,
1539-
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
1540-
errmsg("name list length must be at least %d", 2)));
1541-
break;
15421514
case OBJECT_LARGEOBJECT:
15431515
if (list_length(name) != 1)
15441516
ereport(ERROR,
15451517
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
1546-
errmsg("name list length must be %d", 1)));
1518+
errmsg("name list length must be exactly %d", 1)));
15471519
break;
1520+
case OBJECT_DOMCONSTRAINT:
15481521
case OBJECT_OPCLASS:
15491522
case OBJECT_OPFAMILY:
15501523
case OBJECT_CAST:

‎src/backend/commands/dropcmds.c‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -264,10 +264,14 @@ does_not_exist_skipping(ObjectType objtype, List *objname, List *objargs)
264264
{
265265
case OBJECT_TYPE:
266266
case OBJECT_DOMAIN:
267-
if (!schema_does_not_exist_skipping(objname, &msg, &name))
268267
{
269-
msg = gettext_noop("type \"%s\" does not exist, skipping");
270-
name = TypeNameToString(makeTypeNameFromNameList(objname));
268+
TypeName *typ = linitial(objname);
269+
270+
if (!schema_does_not_exist_skipping(typ->names, &msg, &name))
271+
{
272+
msg = gettext_noop("type \"%s\" does not exist, skipping");
273+
name = TypeNameToString(typ);
274+
}
271275
}
272276
break;
273277
case OBJECT_COLLATION:

‎src/backend/parser/gram.y‎

Lines changed: 91 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
351351
opt_column_list columnList opt_name_list
352352
sort_clause opt_sort_clause sortby_list index_params
353353
name_list role_list from_clause from_list opt_array_bounds
354-
qualified_name_list any_name any_name_list
354+
qualified_name_list any_name any_name_list type_name_list
355355
any_operator expr_list attrs
356356
target_list opt_target_list insert_column_list set_target_list
357357
set_clause_list set_clause multiple_set_clause
@@ -5471,6 +5471,46 @@ DropStmt: DROP drop_type IF_P EXISTS any_name_list opt_drop_behavior
54715471
n->concurrent = false;
54725472
$$ = (Node *)n;
54735473
}
5474+
| DROP TYPE_P type_name_list opt_drop_behavior
5475+
{
5476+
DropStmt *n = makeNode(DropStmt);
5477+
n->removeType = OBJECT_TYPE;
5478+
n->missing_ok = FALSE;
5479+
n->objects = $3;
5480+
n->behavior = $4;
5481+
n->concurrent = false;
5482+
$$ = (Node *) n;
5483+
}
5484+
| DROP TYPE_P IF_P EXISTS type_name_list opt_drop_behavior
5485+
{
5486+
DropStmt *n = makeNode(DropStmt);
5487+
n->removeType = OBJECT_TYPE;
5488+
n->missing_ok = TRUE;
5489+
n->objects = $5;
5490+
n->behavior = $6;
5491+
n->concurrent = false;
5492+
$$ = (Node *) n;
5493+
}
5494+
| DROP DOMAIN_P type_name_list opt_drop_behavior
5495+
{
5496+
DropStmt *n = makeNode(DropStmt);
5497+
n->removeType = OBJECT_DOMAIN;
5498+
n->missing_ok = FALSE;
5499+
n->objects = $3;
5500+
n->behavior = $4;
5501+
n->concurrent = false;
5502+
$$ = (Node *) n;
5503+
}
5504+
| DROP DOMAIN_P IF_P EXISTS type_name_list opt_drop_behavior
5505+
{
5506+
DropStmt *n = makeNode(DropStmt);
5507+
n->removeType = OBJECT_DOMAIN;
5508+
n->missing_ok = TRUE;
5509+
n->objects = $5;
5510+
n->behavior = $6;
5511+
n->concurrent = false;
5512+
$$ = (Node *) n;
5513+
}
54745514
| DROP INDEX CONCURRENTLY any_name_list opt_drop_behavior
54755515
{
54765516
DropStmt *n = makeNode(DropStmt);
@@ -5503,8 +5543,6 @@ drop_type: TABLE { $$ = OBJECT_TABLE; }
55035543
| INDEX { $$ = OBJECT_INDEX; }
55045544
| FOREIGN TABLE { $$ = OBJECT_FOREIGN_TABLE; }
55055545
| EVENT TRIGGER { $$ = OBJECT_EVENT_TRIGGER; }
5506-
| TYPE_P { $$ = OBJECT_TYPE; }
5507-
| DOMAIN_P { $$ = OBJECT_DOMAIN; }
55085546
| COLLATION { $$ = OBJECT_COLLATION; }
55095547
| CONVERSION_P { $$ = OBJECT_CONVERSION; }
55105548
| SCHEMA { $$ = OBJECT_SCHEMA; }
@@ -5530,6 +5568,9 @@ attrs: '.' attr_name
55305568
{ $$ = lappend($1, makeString($3)); }
55315569
;
55325570

5571+
type_name_list:
5572+
Typename { $$ = list_make1(list_make1($1)); }
5573+
| type_name_list ',' Typename { $$ = lappend($1, list_make1($3)); }
55335574

55345575
/*****************************************************************************
55355576
*
@@ -5594,6 +5635,24 @@ CommentStmt:
55945635
n->comment = $6;
55955636
$$ = (Node *) n;
55965637
}
5638+
| COMMENT ON TYPE_P Typename IS comment_text
5639+
{
5640+
CommentStmt *n = makeNode(CommentStmt);
5641+
n->objtype = OBJECT_TYPE;
5642+
n->objname = list_make1($4);
5643+
n->objargs = NIL;
5644+
n->comment = $6;
5645+
$$ = (Node *) n;
5646+
}
5647+
| COMMENT ON DOMAIN_P Typename IS comment_text
5648+
{
5649+
CommentStmt *n = makeNode(CommentStmt);
5650+
n->objtype = OBJECT_DOMAIN;
5651+
n->objname = list_make1($4);
5652+
n->objargs = NIL;
5653+
n->comment = $6;
5654+
$$ = (Node *) n;
5655+
}
55975656
| COMMENT ON AGGREGATE func_name aggr_args IS comment_text
55985657
{
55995658
CommentStmt *n = makeNode(CommentStmt);
@@ -5634,8 +5693,13 @@ CommentStmt:
56345693
{
56355694
CommentStmt *n = makeNode(CommentStmt);
56365695
n->objtype = OBJECT_DOMCONSTRAINT;
5637-
n->objname = lappend($7, makeString($4));
5638-
n->objargs = NIL;
5696+
/*
5697+
* should use Typename not any_name in the production, but
5698+
* there's a shift/reduce conflict if we do that, so fix it
5699+
* up here.
5700+
*/
5701+
n->objname = list_make1(makeTypeNameFromNameList($7));
5702+
n->objargs = list_make1(makeString($4));
56395703
n->comment = $9;
56405704
$$ = (Node *) n;
56415705
}
@@ -5730,8 +5794,6 @@ comment_type:
57305794
| INDEX { $$ = OBJECT_INDEX; }
57315795
| SEQUENCE { $$ = OBJECT_SEQUENCE; }
57325796
| TABLE { $$ = OBJECT_TABLE; }
5733-
| DOMAIN_P { $$ = OBJECT_DOMAIN; }
5734-
| TYPE_P { $$ = OBJECT_TYPE; }
57355797
| VIEW { $$ = OBJECT_VIEW; }
57365798
| MATERIALIZED VIEW { $$ = OBJECT_MATVIEW; }
57375799
| COLLATION { $$ = OBJECT_COLLATION; }
@@ -5776,6 +5838,28 @@ SecLabelStmt:
57765838
n->label = $8;
57775839
$$ = (Node *) n;
57785840
}
5841+
| SECURITY LABEL opt_provider ON TYPE_P Typename
5842+
IS security_label
5843+
{
5844+
SecLabelStmt *n = makeNode(SecLabelStmt);
5845+
n->provider = $3;
5846+
n->objtype = OBJECT_TYPE;
5847+
n->objname = list_make1($6);
5848+
n->objargs = NIL;
5849+
n->label = $8;
5850+
$$ = (Node *) n;
5851+
}
5852+
| SECURITY LABEL opt_provider ON DOMAIN_P Typename
5853+
IS security_label
5854+
{
5855+
SecLabelStmt *n = makeNode(SecLabelStmt);
5856+
n->provider = $3;
5857+
n->objtype = OBJECT_TYPE;
5858+
n->objname = list_make1($6);
5859+
n->objargs = NIL;
5860+
n->label = $8;
5861+
$$ = (Node *) n;
5862+
}
57795863
| SECURITY LABEL opt_provider ON AGGREGATE func_name aggr_args
57805864
IS security_label
57815865
{
@@ -5834,10 +5918,8 @@ security_label_type:
58345918
| SCHEMA { $$ = OBJECT_SCHEMA; }
58355919
| SEQUENCE { $$ = OBJECT_SEQUENCE; }
58365920
| TABLE { $$ = OBJECT_TABLE; }
5837-
| DOMAIN_P { $$ = OBJECT_TYPE; }
58385921
| ROLE { $$ = OBJECT_ROLE; }
58395922
| TABLESPACE { $$ = OBJECT_TABLESPACE; }
5840-
| TYPE_P { $$ = OBJECT_TYPE; }
58415923
| VIEW { $$ = OBJECT_VIEW; }
58425924
| MATERIALIZED VIEW { $$ = OBJECT_MATVIEW; }
58435925
;

‎src/test/regress/sql/object_address.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ WITH objects (type, name, args) AS (VALUES
132132
('cast', '{int8}', '{int4}'),
133133
('collation', '{default}', '{}'),
134134
('table constraint', '{addr_nsp, gentable, a_chk}', '{}'),
135-
('domain constraint', '{addr_nsp, gendomain, domconstr}', '{}'),
135+
('domain constraint', '{addr_nsp.gendomain}', '{domconstr}'),
136136
('conversion', '{pg_catalog, ascii_to_mic}', '{}'),
137137
('default value', '{addr_nsp, gentable, b}', '{}'),
138138
('language', '{plpgsql}', '{}'),

0 commit comments

Comments
 (0)