BREAKING! Parse BigQuery REVOKE as RevokePrivilegeStmt

Author: nene

src/cst/Dcl.ts

@@ -19,10 +19,7 @@ export type AllDclNodes =
   | GranteeGroup
   | GranteePublic;
 
-export type AllDclStatements =
-  | GrantPrivilegeStmt
-  | RevokeRoleStmt
-  | RevokePrivilegeStmt;
+export type AllDclStatements = GrantPrivilegeStmt | RevokePrivilegeStmt;
 
 // GRANT privilege ON resource TO roles
 export interface GrantPrivilegeStmt extends BaseNode {
@@ -215,32 +212,18 @@ export interface GrantedByClause extends BaseNode {
   role: Grantee;
 }
 
-// REVOKE role ON resource FROM user
-export interface RevokeRoleStmt extends BaseNode {
-  type: "revoke_role_stmt";
-  revokeKw: Keyword<"REVOKE">;
-  roles: ListExpr<Identifier>;
-  onKw: Keyword<"ON">;
-  resourceType:
-    | Keyword<"SCHEMA" | "TABLE" | "VIEW">
-    | [Keyword<"EXTERNAL">, Keyword<"TABLE">];
-  resourceName: EntityName;
-  fromKw: Keyword<"FROM">;
-  users: ListExpr<StringLiteral>;
-}
-
 // REVOKE privilege ON resource FROM roles
 export interface RevokePrivilegeStmt extends BaseNode {
   type: "revoke_privilege_stmt";
   revokeKw: Keyword<"REVOKE">;
   grantOptionForKw?: [Keyword<"GRANT">, Keyword<"OPTION">, Keyword<"FOR">];
-  privileges: ListExpr<Privilege> | AllPrivileges;
+  privileges: ListExpr<Privilege> | ListExpr<Identifier> | AllPrivileges;
   onKw: Keyword<"ON">;
   resource: GrantResource;
   fromKw: Keyword<"FROM">;
-  roles: ListExpr<Grantee>;
+  roles: ListExpr<Grantee> | ListExpr<StringLiteral>;
   grantedBy?: GrantedByClause;
-  behaviorKw: Keyword<"CASCADE" | "RESTRICT">;
+  behaviorKw?: Keyword<"CASCADE" | "RESTRICT">;
 }
 
 type Grantee = Identifier | FuncCall | GranteeGroup | GranteePublic;

src/parser.pegjs

@@ -4732,8 +4732,7 @@ release_savepoint_stmt
  * ------------------------------------------------------------------------------------ *
  */
 dcl_statement
-  = &bigquery x:(grant_privilege_stmt / revoke_role_stmt) { return x; }
-  / &postgres x:(grant_privilege_stmt / revoke_privilege_stmt) { return x; }
+  = (&bigquery / &postgres) x:(grant_privilege_stmt / revoke_privilege_stmt) { return x; }
 
 grant_privilege_stmt
   = &postgres
@@ -4868,30 +4867,9 @@ granted_by_clause
     return loc({ type: "granted_by_clause", grantedByKw: read(kw), role });
   }
 
-revoke_role_stmt
-  = kw:(REVOKE __) roles:(list$ident __)
-    onKw:(ON __) resType:(resource_type_kw __) resName:(entity_name __)
-    fromKw:(FROM __) users:(list$string_literal) {
-      return loc({
-        type: "revoke_role_stmt",
-        revokeKw: read(kw),
-        roles: read(roles),
-        onKw: read(onKw),
-        resourceType: read(resType),
-        resourceName: read(resName),
-        fromKw: read(fromKw),
-        users,
-      });
-    }
-
-resource_type_kw
-  = SCHEMA
-  / TABLE
-  / VIEW
-  / kw:(EXTERNAL __ TABLE) { return read(kw); }
-
 revoke_privilege_stmt
-  = kw:(REVOKE __) grantOptionForKw:(GRANT __ OPTION __ FOR __)?
+  = &postgres
+    kw:(REVOKE __) grantOptionForKw:(GRANT __ OPTION __ FOR __)?
     privileges:((list$privilege / all_privileges) __)
     onKw:(ON __) resource:(grant_resource_postgres __)
     fromKw:(FROM __) roles:list$grantee
@@ -4910,6 +4888,20 @@ revoke_privilege_stmt
         behaviorKw: read(behaviorKw),
       });
     }
+  / &bigquery
+    kw:(REVOKE __) privileges:(list$ident __)
+    onKw:(ON __) resource:(grant_resource_bigquery __)
+    fromKw:(FROM __) roles:list$string_literal {
+      return loc({
+        type: "revoke_privilege_stmt",
+        revokeKw: read(kw),
+        privileges: read(privileges),
+        onKw: read(onKw),
+        resource: read(resource),
+        fromKw: read(fromKw),
+        roles,
+      });
+    }
 
 /**
  * ------------------------------------------------------------------------------------ *

src/showNode/dcl.ts

@@ -42,16 +42,6 @@ export const dclMap: FullTransformMap<string, AllDclNodes> = {
   grant_resource_view: (node) => show([node.viewKw, node.views]),
   granted_by_clause: (node) => show([node.grantedByKw, node.role]),
 
-  revoke_role_stmt: (node) =>
-    show([
-      node.revokeKw,
-      node.roles,
-      node.onKw,
-      node.resourceType,
-      node.resourceName,
-      node.fromKw,
-      node.users,
-    ]),
   revoke_privilege_stmt: (node) =>
     show([
       node.revokeKw,