add new ident parse func: option_ident

databendlabs · Feb 14, 2025 · b13e777 · b13e777
1 parent 81b8d88
commit b13e777
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 8 deletions.
diff --git a/src/query/ast/src/parser/common.rs b/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 option_ident(i: Input) -> IResult<Identifier> {
+    non_reserved_identifier(|token| token.is_option_reserved_ident(false, true))(i)
+}
+
 pub fn plain_ident(i: Input) -> IResult<Identifier> {
     plain_identifier(|token| token.is_reserved_ident(false))(i)
 }

diff --git a/src/query/ast/src/parser/stage.rs b/src/query/ast/src/parser/stage.rs
@@ -47,7 +47,7 @@ pub fn connection_opt(sep: &'static str) -> impl FnMut(Input) -> IResult<(String
     move |i| {
         let string_options = map(
             rule! {
-                #ident ~ #match_text(sep) ~ #literal_string
+                #option_ident ~ #match_text(sep) ~ #literal_string
             },
             |(k, _, v)| (k.to_string().to_lowercase(), v),
         );

diff --git a/src/query/ast/src/parser/token.rs b/src/query/ast/src/parser/token.rs
@@ -1772,6 +1772,13 @@ impl TokenKind {
             _ => false
         }
     }
+
+    pub(crate) fn is_option_reserved_ident(&self, after_as: bool, in_option: bool) -> bool {
+        match self {
+            TokenKind::WAREHOUSE if in_option => false,
+            _ => self.is_reserved_ident(after_as),
+        }
+    }
 }
 
 pub fn all_reserved_keywords() -> Vec<String> {

diff --git a/src/query/ast/tests/it/parser.rs b/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;"#,

diff --git a/src/query/ast/tests/it/testdata/stmt.txt b/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",
         },
     },
 )

diff --git a/tests/sqllogictests/suites/base/05_ddl/05_0029_ddl_create_catalog.test b/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;

diff --git a/tests/sqllogictests/suites/tpch_iceberg/prune.test b/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'
 );

diff --git a/tests/sqllogictests/suites/tpch_iceberg/queries.test b/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'
 );

diff --git a/tests/suites/3_stateful_iceberg/00_rest/00_0000_create_and_show.sh b/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