Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit2c6f37e

Browse files
committed
Replace GrantObjectType with ObjectType
There used to be a lot of different *Type and *Kind symbol groups toaddress objects within different commands, most of which have beenreplaced by ObjectType, starting withb256f24. But this conversion was neverdone for the ACL commands until now.This change ends up being just a plain replacement of the types andsymbols, without any code restructuring needed, except deleting some nowredundant code.Reviewed-by: Michael Paquier <michael.paquier@gmail.com>Reviewed-by: Stephen Frost <sfrost@snowman.net>
1 parent42b5856 commit2c6f37e

File tree

14 files changed

+302
-285
lines changed

14 files changed

+302
-285
lines changed

‎src/backend/catalog/aclchk.c‎

Lines changed: 122 additions & 122 deletions
Large diffs are not rendered by default.

‎src/backend/catalog/heap.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1143,11 +1143,11 @@ heap_create_with_catalog(const char *relname,
11431143
caseRELKIND_MATVIEW:
11441144
caseRELKIND_FOREIGN_TABLE:
11451145
caseRELKIND_PARTITIONED_TABLE:
1146-
relacl=get_user_default_acl(ACL_OBJECT_RELATION,ownerid,
1146+
relacl=get_user_default_acl(OBJECT_TABLE,ownerid,
11471147
relnamespace);
11481148
break;
11491149
caseRELKIND_SEQUENCE:
1150-
relacl=get_user_default_acl(ACL_OBJECT_SEQUENCE,ownerid,
1150+
relacl=get_user_default_acl(OBJECT_SEQUENCE,ownerid,
11511151
relnamespace);
11521152
break;
11531153
default:

‎src/backend/catalog/pg_namespace.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ NamespaceCreate(const char *nspName, Oid ownerId, bool isTemp)
6363
errmsg("schema \"%s\" already exists",nspName)));
6464

6565
if (!isTemp)
66-
nspacl=get_user_default_acl(ACL_OBJECT_NAMESPACE,ownerId,
66+
nspacl=get_user_default_acl(OBJECT_SCHEMA,ownerId,
6767
InvalidOid);
6868
else
6969
nspacl=NULL;

‎src/backend/catalog/pg_proc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ ProcedureCreate(const char *procedureName,
582582
/* Creating a new procedure */
583583

584584
/* First, get default permissions and set up proacl */
585-
proacl=get_user_default_acl(ACL_OBJECT_FUNCTION,proowner,
585+
proacl=get_user_default_acl(OBJECT_FUNCTION,proowner,
586586
procNamespace);
587587
if (proacl!=NULL)
588588
values[Anum_pg_proc_proacl-1]=PointerGetDatum(proacl);

‎src/backend/catalog/pg_type.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ TypeCreate(Oid newTypeOid,
380380
else
381381
nulls[Anum_pg_type_typdefault-1]= true;
382382

383-
typacl=get_user_default_acl(ACL_OBJECT_TYPE,ownerId,
383+
typacl=get_user_default_acl(OBJECT_TYPE,ownerId,
384384
typeNamespace);
385385
if (typacl!=NULL)
386386
values[Anum_pg_type_typacl-1]=PointerGetDatum(typacl);

‎src/backend/commands/event_trigger.c‎

Lines changed: 111 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ static Oid insert_event_trigger_tuple(const char *trigname, const char *eventnam
159159
staticvoidvalidate_ddl_tags(constchar*filtervar,List*taglist);
160160
staticvoidvalidate_table_rewrite_tags(constchar*filtervar,List*taglist);
161161
staticvoidEventTriggerInvoke(List*fn_oid_list,EventTriggerData*trigdata);
162-
staticconstchar*stringify_grantobjtype(GrantObjectTypeobjtype);
163-
staticconstchar*stringify_adefprivs_objtype(GrantObjectTypeobjtype);
162+
staticconstchar*stringify_grant_objtype(ObjectTypeobjtype);
163+
staticconstchar*stringify_adefprivs_objtype(ObjectTypeobjtype);
164164

165165
/*
166166
* Create an event trigger.
@@ -1199,41 +1199,6 @@ EventTriggerSupportsObjectClass(ObjectClass objclass)
11991199
return false;
12001200
}
12011201

1202-
bool
1203-
EventTriggerSupportsGrantObjectType(GrantObjectTypeobjtype)
1204-
{
1205-
switch (objtype)
1206-
{
1207-
caseACL_OBJECT_DATABASE:
1208-
caseACL_OBJECT_TABLESPACE:
1209-
/* no support for global objects */
1210-
return false;
1211-
1212-
caseACL_OBJECT_COLUMN:
1213-
caseACL_OBJECT_RELATION:
1214-
caseACL_OBJECT_SEQUENCE:
1215-
caseACL_OBJECT_DOMAIN:
1216-
caseACL_OBJECT_FDW:
1217-
caseACL_OBJECT_FOREIGN_SERVER:
1218-
caseACL_OBJECT_FUNCTION:
1219-
caseACL_OBJECT_LANGUAGE:
1220-
caseACL_OBJECT_LARGEOBJECT:
1221-
caseACL_OBJECT_NAMESPACE:
1222-
caseACL_OBJECT_PROCEDURE:
1223-
caseACL_OBJECT_ROUTINE:
1224-
caseACL_OBJECT_TYPE:
1225-
return true;
1226-
1227-
/*
1228-
* There's intentionally no default: case here; we want the
1229-
* compiler to warn if a new ACL class hasn't been handled above.
1230-
*/
1231-
}
1232-
1233-
/* Shouldn't get here, but if we do, say "no support" */
1234-
return false;
1235-
}
1236-
12371202
/*
12381203
* Prepare event trigger state for a new complete query to run, if necessary;
12391204
* returns whether this was done. If it was, EventTriggerEndCompleteQuery must
@@ -2196,7 +2161,7 @@ pg_event_trigger_ddl_commands(PG_FUNCTION_ARGS)
21962161
values[i++]=CStringGetTextDatum(cmd->d.grant.istmt->is_grant ?
21972162
"GRANT" :"REVOKE");
21982163
/* object_type */
2199-
values[i++]=CStringGetTextDatum(stringify_grantobjtype(
2164+
values[i++]=CStringGetTextDatum(stringify_grant_objtype(
22002165
cmd->d.grant.istmt->objtype));
22012166
/* schema */
22022167
nulls[i++]= true;
@@ -2219,92 +2184,164 @@ pg_event_trigger_ddl_commands(PG_FUNCTION_ARGS)
22192184
}
22202185

22212186
/*
2222-
* Return theGrantObjectType as a string, as it would appear in GRANT and
2187+
* Return theObjectType as a string, as it would appear in GRANT and
22232188
* REVOKE commands.
22242189
*/
22252190
staticconstchar*
2226-
stringify_grantobjtype(GrantObjectTypeobjtype)
2191+
stringify_grant_objtype(ObjectTypeobjtype)
22272192
{
22282193
switch (objtype)
22292194
{
2230-
caseACL_OBJECT_COLUMN:
2195+
caseOBJECT_COLUMN:
22312196
return"COLUMN";
2232-
caseACL_OBJECT_RELATION:
2197+
caseOBJECT_TABLE:
22332198
return"TABLE";
2234-
caseACL_OBJECT_SEQUENCE:
2199+
caseOBJECT_SEQUENCE:
22352200
return"SEQUENCE";
2236-
caseACL_OBJECT_DATABASE:
2201+
caseOBJECT_DATABASE:
22372202
return"DATABASE";
2238-
caseACL_OBJECT_DOMAIN:
2203+
caseOBJECT_DOMAIN:
22392204
return"DOMAIN";
2240-
caseACL_OBJECT_FDW:
2205+
caseOBJECT_FDW:
22412206
return"FOREIGN DATA WRAPPER";
2242-
caseACL_OBJECT_FOREIGN_SERVER:
2207+
caseOBJECT_FOREIGN_SERVER:
22432208
return"FOREIGN SERVER";
2244-
caseACL_OBJECT_FUNCTION:
2209+
caseOBJECT_FUNCTION:
22452210
return"FUNCTION";
2246-
caseACL_OBJECT_LANGUAGE:
2211+
caseOBJECT_LANGUAGE:
22472212
return"LANGUAGE";
2248-
caseACL_OBJECT_LARGEOBJECT:
2213+
caseOBJECT_LARGEOBJECT:
22492214
return"LARGE OBJECT";
2250-
caseACL_OBJECT_NAMESPACE:
2215+
caseOBJECT_SCHEMA:
22512216
return"SCHEMA";
2252-
caseACL_OBJECT_PROCEDURE:
2217+
caseOBJECT_PROCEDURE:
22532218
return"PROCEDURE";
2254-
caseACL_OBJECT_ROUTINE:
2219+
caseOBJECT_ROUTINE:
22552220
return"ROUTINE";
2256-
caseACL_OBJECT_TABLESPACE:
2221+
caseOBJECT_TABLESPACE:
22572222
return"TABLESPACE";
2258-
caseACL_OBJECT_TYPE:
2223+
caseOBJECT_TYPE:
22592224
return"TYPE";
2225+
/* these currently aren't used */
2226+
caseOBJECT_ACCESS_METHOD:
2227+
caseOBJECT_AGGREGATE:
2228+
caseOBJECT_AMOP:
2229+
caseOBJECT_AMPROC:
2230+
caseOBJECT_ATTRIBUTE:
2231+
caseOBJECT_CAST:
2232+
caseOBJECT_COLLATION:
2233+
caseOBJECT_CONVERSION:
2234+
caseOBJECT_DEFAULT:
2235+
caseOBJECT_DEFACL:
2236+
caseOBJECT_DOMCONSTRAINT:
2237+
caseOBJECT_EVENT_TRIGGER:
2238+
caseOBJECT_EXTENSION:
2239+
caseOBJECT_FOREIGN_TABLE:
2240+
caseOBJECT_INDEX:
2241+
caseOBJECT_MATVIEW:
2242+
caseOBJECT_OPCLASS:
2243+
caseOBJECT_OPERATOR:
2244+
caseOBJECT_OPFAMILY:
2245+
caseOBJECT_POLICY:
2246+
caseOBJECT_PUBLICATION:
2247+
caseOBJECT_PUBLICATION_REL:
2248+
caseOBJECT_ROLE:
2249+
caseOBJECT_RULE:
2250+
caseOBJECT_STATISTIC_EXT:
2251+
caseOBJECT_SUBSCRIPTION:
2252+
caseOBJECT_TABCONSTRAINT:
2253+
caseOBJECT_TRANSFORM:
2254+
caseOBJECT_TRIGGER:
2255+
caseOBJECT_TSCONFIGURATION:
2256+
caseOBJECT_TSDICTIONARY:
2257+
caseOBJECT_TSPARSER:
2258+
caseOBJECT_TSTEMPLATE:
2259+
caseOBJECT_USER_MAPPING:
2260+
caseOBJECT_VIEW:
2261+
elog(ERROR,"unsupported object type: %d", (int)objtype);
22602262
}
22612263

2262-
elog(ERROR,"unrecognized grant object type: %d", (int)objtype);
22632264
return"???";/* keep compiler quiet */
22642265
}
22652266

22662267
/*
2267-
* Return theGrantObjectType as a string; as above, but use the spelling
2268+
* Return theObjectType as a string; as above, but use the spelling
22682269
* in ALTER DEFAULT PRIVILEGES commands instead. Generally this is just
22692270
* the plural.
22702271
*/
22712272
staticconstchar*
2272-
stringify_adefprivs_objtype(GrantObjectTypeobjtype)
2273+
stringify_adefprivs_objtype(ObjectTypeobjtype)
22732274
{
22742275
switch (objtype)
22752276
{
2276-
caseACL_OBJECT_COLUMN:
2277+
caseOBJECT_COLUMN:
22772278
return"COLUMNS";
2278-
caseACL_OBJECT_RELATION:
2279+
caseOBJECT_TABLE:
22792280
return"TABLES";
2280-
caseACL_OBJECT_SEQUENCE:
2281+
caseOBJECT_SEQUENCE:
22812282
return"SEQUENCES";
2282-
caseACL_OBJECT_DATABASE:
2283+
caseOBJECT_DATABASE:
22832284
return"DATABASES";
2284-
caseACL_OBJECT_DOMAIN:
2285+
caseOBJECT_DOMAIN:
22852286
return"DOMAINS";
2286-
caseACL_OBJECT_FDW:
2287+
caseOBJECT_FDW:
22872288
return"FOREIGN DATA WRAPPERS";
2288-
caseACL_OBJECT_FOREIGN_SERVER:
2289+
caseOBJECT_FOREIGN_SERVER:
22892290
return"FOREIGN SERVERS";
2290-
caseACL_OBJECT_FUNCTION:
2291+
caseOBJECT_FUNCTION:
22912292
return"FUNCTIONS";
2292-
caseACL_OBJECT_LANGUAGE:
2293+
caseOBJECT_LANGUAGE:
22932294
return"LANGUAGES";
2294-
caseACL_OBJECT_LARGEOBJECT:
2295+
caseOBJECT_LARGEOBJECT:
22952296
return"LARGE OBJECTS";
2296-
caseACL_OBJECT_NAMESPACE:
2297+
caseOBJECT_SCHEMA:
22972298
return"SCHEMAS";
2298-
caseACL_OBJECT_PROCEDURE:
2299+
caseOBJECT_PROCEDURE:
22992300
return"PROCEDURES";
2300-
caseACL_OBJECT_ROUTINE:
2301+
caseOBJECT_ROUTINE:
23012302
return"ROUTINES";
2302-
caseACL_OBJECT_TABLESPACE:
2303+
caseOBJECT_TABLESPACE:
23032304
return"TABLESPACES";
2304-
caseACL_OBJECT_TYPE:
2305+
caseOBJECT_TYPE:
23052306
return"TYPES";
2307+
/* these currently aren't used */
2308+
caseOBJECT_ACCESS_METHOD:
2309+
caseOBJECT_AGGREGATE:
2310+
caseOBJECT_AMOP:
2311+
caseOBJECT_AMPROC:
2312+
caseOBJECT_ATTRIBUTE:
2313+
caseOBJECT_CAST:
2314+
caseOBJECT_COLLATION:
2315+
caseOBJECT_CONVERSION:
2316+
caseOBJECT_DEFAULT:
2317+
caseOBJECT_DEFACL:
2318+
caseOBJECT_DOMCONSTRAINT:
2319+
caseOBJECT_EVENT_TRIGGER:
2320+
caseOBJECT_EXTENSION:
2321+
caseOBJECT_FOREIGN_TABLE:
2322+
caseOBJECT_INDEX:
2323+
caseOBJECT_MATVIEW:
2324+
caseOBJECT_OPCLASS:
2325+
caseOBJECT_OPERATOR:
2326+
caseOBJECT_OPFAMILY:
2327+
caseOBJECT_POLICY:
2328+
caseOBJECT_PUBLICATION:
2329+
caseOBJECT_PUBLICATION_REL:
2330+
caseOBJECT_ROLE:
2331+
caseOBJECT_RULE:
2332+
caseOBJECT_STATISTIC_EXT:
2333+
caseOBJECT_SUBSCRIPTION:
2334+
caseOBJECT_TABCONSTRAINT:
2335+
caseOBJECT_TRANSFORM:
2336+
caseOBJECT_TRIGGER:
2337+
caseOBJECT_TSCONFIGURATION:
2338+
caseOBJECT_TSDICTIONARY:
2339+
caseOBJECT_TSPARSER:
2340+
caseOBJECT_TSTEMPLATE:
2341+
caseOBJECT_USER_MAPPING:
2342+
caseOBJECT_VIEW:
2343+
elog(ERROR,"unsupported object type: %d", (int)objtype);
23062344
}
23072345

2308-
elog(ERROR,"unrecognized grant object type: %d", (int)objtype);
23092346
return"???";/* keep compiler quiet */
23102347
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp