feat: add privilege name

4paradigm · Feb 21, 2024 · 65db553 · 65db553
1 parent 55be108
commit 65db553
Show file tree

Hide file tree

Showing 4 changed files with 345 additions and 0 deletions.
diff --git a/zetasql/parser/bison_parser.y b/zetasql/parser/bison_parser.y
@@ -818,6 +818,7 @@ using zetasql::ASTDropStatement;
 %token KW_CURRENT_ROW "CURRENT_ROW"
 %token KW_DATA "DATA"
 %token KW_DATABASE "DATABASE"
+%token KW_DATABASES "DATABASES"
 %token KW_DATE "DATE"
 %token KW_DATETIME "DATETIME"
 %token KW_DECIMAL "DECIMAL"
@@ -908,6 +909,7 @@ using zetasql::ASTDropStatement;
 %token KW_RETURN "RETURN"
 %token KW_RETURNS "RETURNS"
 %token KW_REVOKE "REVOKE"
+%token KW_ROLE "ROLE"
 %token KW_ROLLBACK "ROLLBACK"
 %token KW_ROW "ROW"
 %token KW_RUN "RUN"
@@ -3440,6 +3442,50 @@ privilege_name:
         // The SELECT keyword is allowed to be a privilege name.
         $$ = parser->MakeIdentifier(@1, parser->GetInputText(@1));
       }
+    | KW_CREATE
+      {
+        // The CREATE keyword is allowed to be a privilege name.
+        $$ = parser->MakeIdentifier(@1, parser->GetInputText(@1));
+      }
+    | KW_INDEX
+      {
+        $$ = parser->MakeIdentifier(@1, parser->GetInputText(@1));
+      }
+    | KW_ALTER KW_USER
+      {
+        std::string identifier = absl::StrCat(parser->GetInputText(@1), " ", parser->GetInputText(@2));
+        $$ = parser->MakeIdentifier(@$, identifier.c_str());
+      }
+    | KW_CREATE KW_USER
+      {
+        std::string identifier = absl::StrCat(parser->GetInputText(@1), " ", parser->GetInputText(@2));
+        $$ = parser->MakeIdentifier(@$, identifier.c_str());
+      }
+    | KW_CREATE KW_ROLE
+      {
+        std::string identifier = absl::StrCat(parser->GetInputText(@1), " ", parser->GetInputText(@2));
+        $$ = parser->MakeIdentifier(@$, identifier.c_str());
+      }
+    | KW_DROP "DEPLOYMENT"
+      {
+        std::string identifier = absl::StrCat(parser->GetInputText(@1), " ", parser->GetInputText(@2));
+        $$ = parser->MakeIdentifier(@$, identifier.c_str());
+      }
+    | KW_DROP KW_USER
+      {
+        std::string identifier = absl::StrCat(parser->GetInputText(@1), " ", parser->GetInputText(@2));
+        $$ = parser->MakeIdentifier(@$, identifier.c_str());
+      }
+    | KW_DROP KW_ROLE
+      {
+        std::string identifier = absl::StrCat(parser->GetInputText(@1), " ", parser->GetInputText(@2));
+        $$ = parser->MakeIdentifier(@$, identifier.c_str());
+      }
+    | KW_SHOW KW_DATABASES
+      {
+        std::string identifier = absl::StrCat(parser->GetInputText(@1), " ", parser->GetInputText(@2));
+        $$ = parser->MakeIdentifier(@$, identifier.c_str());
+      }
     ;
 
 rename_statement:
@@ -7557,6 +7603,7 @@ keyword_as_identifier:
     | "CURRENT_ROW"
     | "DATA"
     | "DATABASE"
+    | "DATABASES"
     | "DATE"
     | "DATETIME"
     | "DECIMAL"
@@ -7648,6 +7695,7 @@ keyword_as_identifier:
     | "RETURNS"
     | "RETURN"
     | "REVOKE"
+    | "ROLE"
     | "ROLLBACK"
     | "ROW"
     | "RUN"

diff --git a/zetasql/parser/flex_tokenizer.l b/zetasql/parser/flex_tokenizer.l
@@ -407,6 +407,7 @@ current_time { return BisonParserImpl::token::KW_CURRENT_TIME;}
 current_row { return BisonParserImpl::token::KW_CURRENT_ROW; }
 data { return BisonParserImpl::token::KW_DATA; }
 database { return BisonParserImpl::token::KW_DATABASE; }
+databases { return BisonParserImpl::token::KW_DATABASES; }
 date { return BisonParserImpl::token::KW_DATE; }
 datetime { return BisonParserImpl::token::KW_DATETIME; }
 decimal { return BisonParserImpl::token::KW_DECIMAL; }
@@ -603,6 +604,7 @@ return { return BisonParserImpl::token::KW_RETURN; }
 returns { return BisonParserImpl::token::KW_RETURNS; }
 revoke { return BisonParserImpl::token::KW_REVOKE; }
 right { return BisonParserImpl::token::KW_RIGHT; }
+role { return BisonParserImpl::token::KW_ROLE; }
 rollback { return BisonParserImpl::token::KW_ROLLBACK; }
 rollup { return BisonParserImpl::token::KW_ROLLUP; }
 row { return BisonParserImpl::token::KW_ROW; }

diff --git a/zetasql/parser/keywords.cc b/zetasql/parser/keywords.cc
@@ -100,6 +100,7 @@ constexpr KeywordInfoPOD kAllKeywords[] = {
     {"current_row", KW_CURRENT_ROW},
     {"data", KW_DATA},
     {"database", KW_DATABASE},
+    {"databases", KW_DATABASES},
     {"date", KW_DATE},
     {"datetime", KW_DATETIME},
     {"decimal", KW_DECIMAL},
@@ -259,6 +260,7 @@ constexpr KeywordInfoPOD kAllKeywords[] = {
     {"returns", KW_RETURNS},
     {"revoke", KW_REVOKE},
     {"right", KW_RIGHT, KeywordInfo::kReserved},
+    {"role", KW_ROLE},
     {"rollback", KW_ROLLBACK},
     {"rollup", KW_ROLLUP, KeywordInfo::kReserved},
     {"row", KW_ROW},