database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-10-28 11:55:03 +03:00
Code Activity

Replace GrantObjectType with ObjectType

Browse Source 
There used to be a lot of different *Type and *Kind symbol groups to
address objects within different commands, most of which have been
replaced by ObjectType, starting with
b256f24264.  But this conversion was never
done for the ACL commands until now.

This change ends up being just a plain replacement of the types and
symbols, without any code restructuring needed, except deleting some now
redundant code.

Reviewed-by: Michael Paquier <michael.paquier@gmail.com>
Reviewed-by: Stephen Frost <sfrost@snowman.net>
This commit is contained in:
Peter Eisentraut
2017-10-11 18:35:19 -04:00
parent 42b5856038
commit 2c6f37ed62
14 changed files with 302 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/backend/parser/gram.y
View File

@@ -115,7 +115,7 @@
typedef struct PrivTarget
{
GrantTargetType targtype;
GrantObjectType objtype;
ObjectType objtype;
List *objs;
} PrivTarget;
@@ -7027,7 +7027,7 @@ privilege_target:
{
PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
n->targtype = ACL_TARGET_OBJECT;
n->objtype = ACL_OBJECT_RELATION;
n->objtype = OBJECT_TABLE;
n->objs = $1;
$$ = n;
}
@@ -7035,7 +7035,7 @@ privilege_target:
{
PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
n->targtype = ACL_TARGET_OBJECT;
n->objtype = ACL_OBJECT_RELATION;
n->objtype = OBJECT_TABLE;
n->objs = $2;
$$ = n;
}
@@ -7043,7 +7043,7 @@ privilege_target:
{
PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
n->targtype = ACL_TARGET_OBJECT;
n->objtype = ACL_OBJECT_SEQUENCE;
n->objtype = OBJECT_SEQUENCE;
n->objs = $2;
$$ = n;
}
@@ -7051,7 +7051,7 @@ privilege_target:
{
PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
n->targtype = ACL_TARGET_OBJECT;
n->objtype = ACL_OBJECT_FDW;
n->objtype = OBJECT_FDW;
n->objs = $4;
$$ = n;
}
@@ -7059,7 +7059,7 @@ privilege_target:
{
PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
n->targtype = ACL_TARGET_OBJECT;
n->objtype = ACL_OBJECT_FOREIGN_SERVER;
n->objtype = OBJECT_FOREIGN_SERVER;
n->objs = $3;
$$ = n;
}
@@ -7067,7 +7067,7 @@ privilege_target:
{
PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
n->targtype = ACL_TARGET_OBJECT;
n->objtype = ACL_OBJECT_FUNCTION;
n->objtype = OBJECT_FUNCTION;
n->objs = $2;
$$ = n;
}
@@ -7075,7 +7075,7 @@ privilege_target:
{
PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
n->targtype = ACL_TARGET_OBJECT;
n->objtype = ACL_OBJECT_PROCEDURE;
n->objtype = OBJECT_PROCEDURE;
n->objs = $2;
$$ = n;
}
@@ -7083,7 +7083,7 @@ privilege_target:
{
PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
n->targtype = ACL_TARGET_OBJECT;
n->objtype = ACL_OBJECT_ROUTINE;
n->objtype = OBJECT_ROUTINE;
n->objs = $2;
$$ = n;
}
@@ -7091,7 +7091,7 @@ privilege_target:
{
PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
n->targtype = ACL_TARGET_OBJECT;
n->objtype = ACL_OBJECT_DATABASE;
n->objtype = OBJECT_DATABASE;
n->objs = $2;
$$ = n;
}
@@ -7099,7 +7099,7 @@ privilege_target:
{
PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
n->targtype = ACL_TARGET_OBJECT;
n->objtype = ACL_OBJECT_DOMAIN;
n->objtype = OBJECT_DOMAIN;
n->objs = $2;
$$ = n;
}
@@ -7107,7 +7107,7 @@ privilege_target:
{
PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
n->targtype = ACL_TARGET_OBJECT;
n->objtype = ACL_OBJECT_LANGUAGE;
n->objtype = OBJECT_LANGUAGE;
n->objs = $2;
$$ = n;
}
@@ -7115,7 +7115,7 @@ privilege_target:
{
PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
n->targtype = ACL_TARGET_OBJECT;
n->objtype = ACL_OBJECT_LARGEOBJECT;
n->objtype = OBJECT_LARGEOBJECT;
n->objs = $3;
$$ = n;
}
@@ -7123,7 +7123,7 @@ privilege_target:
{
PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
n->targtype = ACL_TARGET_OBJECT;
n->objtype = ACL_OBJECT_NAMESPACE;
n->objtype = OBJECT_SCHEMA;
n->objs = $2;
$$ = n;
}
@@ -7131,7 +7131,7 @@ privilege_target:
{
PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
n->targtype = ACL_TARGET_OBJECT;
n->objtype = ACL_OBJECT_TABLESPACE;
n->objtype = OBJECT_TABLESPACE;
n->objs = $2;
$$ = n;
}
@@ -7139,7 +7139,7 @@ privilege_target:
{
PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
n->targtype = ACL_TARGET_OBJECT;
n->objtype = ACL_OBJECT_TYPE;
n->objtype = OBJECT_TYPE;
n->objs = $2;
$$ = n;
}
@@ -7147,7 +7147,7 @@ privilege_target:
{
PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
n->targtype = ACL_TARGET_ALL_IN_SCHEMA;
n->objtype = ACL_OBJECT_RELATION;
n->objtype = OBJECT_TABLE;
n->objs = $5;
$$ = n;
}
@@ -7155,7 +7155,7 @@ privilege_target:
{
PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
n->targtype = ACL_TARGET_ALL_IN_SCHEMA;
n->objtype = ACL_OBJECT_SEQUENCE;
n->objtype = OBJECT_SEQUENCE;
n->objs = $5;
$$ = n;
}
@@ -7163,7 +7163,7 @@ privilege_target:
{
PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
n->targtype = ACL_TARGET_ALL_IN_SCHEMA;
n->objtype = ACL_OBJECT_FUNCTION;
n->objtype = OBJECT_FUNCTION;
n->objs = $5;
$$ = n;
}
@@ -7171,7 +7171,7 @@ privilege_target:
{
PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
n->targtype = ACL_TARGET_ALL_IN_SCHEMA;
n->objtype = ACL_OBJECT_PROCEDURE;
n->objtype = OBJECT_PROCEDURE;
n->objs = $5;
$$ = n;
}
@@ -7179,7 +7179,7 @@ privilege_target:
{
PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
n->targtype = ACL_TARGET_ALL_IN_SCHEMA;
n->objtype = ACL_OBJECT_ROUTINE;
n->objtype = OBJECT_ROUTINE;
n->objs = $5;
$$ = n;
}
@@ -7337,12 +7337,12 @@ DefACLAction:
;
defacl_privilege_target:
TABLES { $$ = ACL_OBJECT_RELATION; }
| FUNCTIONS { $$ = ACL_OBJECT_FUNCTION; }
| ROUTINES { $$ = ACL_OBJECT_FUNCTION; }
| SEQUENCES { $$ = ACL_OBJECT_SEQUENCE; }
| TYPES_P { $$ = ACL_OBJECT_TYPE; }
| SCHEMAS { $$ = ACL_OBJECT_NAMESPACE; }
TABLES { $$ = OBJECT_TABLE; }
| FUNCTIONS { $$ = OBJECT_FUNCTION; }
| ROUTINES { $$ = OBJECT_FUNCTION; }
| SEQUENCES { $$ = OBJECT_SEQUENCE; }
| TYPES_P { $$ = OBJECT_TYPE; }
| SCHEMAS { $$ = OBJECT_SCHEMA; }
;