add new ident parse func: grant_ident

Author: TCeason

src/query/ast/src/parser/common.rs

@@ -88,6 +88,10 @@ pub fn ident(i: Input) -> IResult<Identifier> {
     non_reserved_identifier(|token| token.is_reserved_ident(false))(i)
 }
 
+pub fn grant_ident(i: Input) -> IResult<Identifier> {
+    non_reserved_identifier(|token| token.is_grant_reserved_ident(false, true))(i)
+}
+
 pub fn plain_ident(i: Input) -> IResult<Identifier> {
     plain_identifier(|token| token.is_reserved_ident(false))(i)
 }

src/query/ast/src/parser/stage.rs

@@ -30,6 +30,19 @@ use crate::parser::input::Input;
 use crate::parser::token::*;
 use crate::parser::ErrorKind;
 
+pub fn parameter_to_grant_string(i: Input) -> IResult<String> {
+    let ident_to_string = |i| map_res(grant_ident, |ident| Ok(ident.name))(i);
+    let u64_to_string = |i| map(literal_u64, |v| v.to_string())(i);
+    let boolean_to_string = |i| map(literal_bool, |v| v.to_string())(i);
+
+    rule!(
+        #literal_string
+        | #ident_to_string
+        | #u64_to_string
+        | #boolean_to_string
+    )(i)
+}
+
 pub fn parameter_to_string(i: Input) -> IResult<String> {
     let ident_to_string = |i| map_res(ident, |ident| Ok(ident.name))(i);
     let u64_to_string = |i| map(literal_u64, |v| v.to_string())(i);

src/query/ast/src/parser/statement.rs

@@ -3452,15 +3452,15 @@ pub fn grant_ownership_level(i: Input) -> IResult<AccountMgrLevel> {
     // "*": as current db or "table" with current db
     let db = map(
         rule! {
-            ( #ident ~ "." )? ~ "*"
+            ( #grant_ident ~ "." )? ~ "*"
         },
         |(database, _)| AccountMgrLevel::Database(database.map(|(database, _)| database.name)),
     );
 
     // `db01`.'tb1' or `db01`.`tb1` or `db01`.tb1
     let table = map(
         rule! {
-            ( #ident ~ "." )? ~ #parameter_to_string
+            ( #grant_ident ~ "." )? ~ #parameter_to_grant_string
         },
         |(database, table)| {
             AccountMgrLevel::Table(database.map(|(database, _)| database.name), table)
@@ -3481,7 +3481,7 @@ pub fn grant_ownership_level(i: Input) -> IResult<AccountMgrLevel> {
 
     // Object object_name
     let object = map(
-        rule! { #object ~ #ident},
+        rule! { #object ~ #grant_ident },
         |(object, object_name)| match object {
             Object::Stage => AccountMgrLevel::Stage(object_name.to_string()),
             Object::Udf => AccountMgrLevel::UDF(object_name.to_string()),

src/query/ast/src/parser/token.rs

@@ -1754,7 +1754,6 @@ impl TokenKind {
             // | TokenKind::RETURNING
             | TokenKind::STAGE
             | TokenKind::UDF
-            | TokenKind::WAREHOUSE
             | TokenKind::SHARE
             | TokenKind::SHARES
             | TokenKind::TO
@@ -1773,6 +1772,13 @@ impl TokenKind {
             _ => false
         }
     }
+
+    pub(crate) fn is_grant_reserved_ident(&self, after_as: bool, in_grant: bool) -> bool {
+        match self {
+            TokenKind::WAREHOUSE if in_grant => true,
+            _ => self.is_reserved_ident(after_as),
+        }
+    }
 }
 
 pub fn all_reserved_keywords() -> Vec<String> {

src/query/ast/tests/it/parser.rs

@@ -137,7 +137,7 @@ fn test_statement() {
         r#"drop table a;"#,
         r#"drop table if exists a."b";"#,
         r#"use "a";"#,
-        r#"create catalog ctl type=hive connection=(url='<hive-meta-store>' thrift_protocol='binary');"#,
+        r#"create catalog ctl type=hive connection=(url='<hive-meta-store>' thrift_protocol='binary' warehouse='default');"#,
         r#"select current_catalog();"#,
         r#"use catalog ctl;"#,
         r#"create database if not exists a;"#,

src/query/ast/tests/it/testdata/stmt.txt

@@ -2937,9 +2937,9 @@ UseDatabase {
 
 
 ---------- Input ----------
-create catalog ctl type=hive connection=(url='<hive-meta-store>' thrift_protocol='binary');
+create catalog ctl type=hive connection=(url='<hive-meta-store>' thrift_protocol='binary' warehouse='default');
 ---------- Output ---------
-CREATE CATALOG ctl TYPE=HIVE CONNECTION = ( thrift_protocol = 'binary', url = '<hive-meta-store>' )
+CREATE CATALOG ctl TYPE=HIVE CONNECTION = ( thrift_protocol = 'binary', url = '<hive-meta-store>', warehouse = 'default' )
 ---------- AST ------------
 CreateCatalog(
     CreateCatalogStmt {
@@ -2949,6 +2949,7 @@ CreateCatalog(
         catalog_options: {
             "thrift_protocol": "binary",
             "url": "<hive-meta-store>",
+            "warehouse": "default",
         },
     },
 )

tests/sqllogictests/suites/base/05_ddl/05_0029_ddl_create_catalog.test

@@ -10,7 +10,7 @@ SHOW CATALOGS;
 default
 
 statement error 1001
-CREATE CATALOG ctl TYPE=ICEBERG CONNECTION=(TYPE='REST' ADDRESS='http://127.0.0.1:1000' `WAREHOUSE`='default' );
+CREATE CATALOG ctl TYPE=ICEBERG CONNECTION=(TYPE='REST' ADDRESS='http://127.0.0.1:1000' WAREHOUSE='default' );
 
 statement ok
 DROP CATALOG IF EXISTS ctl;

tests/sqllogictests/suites/task/task_ddl_transaction_test.test

@@ -61,8 +61,5 @@ select SPLIT(definition, '\n') from system.tasks where name = 'transactionTask'
 ----
 ['BEGIN','SELECT 2024;','BEGIN;','MERGE INTO t USING s ON t.id = s.id WHEN MATCHED THEN UPDATE *;','DELETE FROM t WHERE c = '';'';','ABORT;','END;'] 
 
-
-
-
 statement ok
 DROP TASK transactionTask

tests/sqllogictests/suites/tpch_iceberg/prune.test

@@ -7,7 +7,7 @@ TYPE=ICEBERG
 CONNECTION=(
     TYPE='rest'
     ADDRESS='http://127.0.0.1:8181'
-    `WAREHOUSE`='s3://iceberg-tpch'
+    WAREHOUSE='s3://iceberg-tpch'
     "s3.region"='us-east-1'
     "s3.endpoint"='http://127.0.0.1:9000'
 );

tests/sqllogictests/suites/tpch_iceberg/queries.test

@@ -7,7 +7,7 @@ TYPE=ICEBERG
 CONNECTION=(
     TYPE='rest'
     ADDRESS='http://127.0.0.1:8181'
-    `WAREHOUSE`='s3://iceberg-tpch'
+    WAREHOUSE='s3://iceberg-tpch'
     "s3.region"='us-east-1'
     "s3.endpoint"='http://127.0.0.1:9000'
 );

tests/suites/3_stateful_iceberg/00_rest/00_0000_create_and_show.sh

@@ -12,7 +12,7 @@ TYPE=ICEBERG
 CONNECTION=(
     TYPE='rest'
     ADDRESS='http://127.0.0.1:8181'
-    `WAREHOUSE`='s3://icebergdata/demo'
+    WAREHOUSE='s3://icebergdata/demo'
 );
 EOF