Merge pull request #10560 from andylokandy/fixx5

fix(parser): properly parse tuple type with field name

Author: mergify[bot]

src/query/ast/src/parser/expr.rs

@@ -1412,26 +1412,20 @@ pub fn type_name(i: Input) -> IResult<TypeName> {
         |(_, item_type)| TypeName::Nullable(Box::new(item_type.1)),
     );
     let ty_tuple = map(
-        rule! { TUPLE ~ "(" ~ #comma_separated_list1(tuple_types) ~ ")" },
-        |(_, _, tuple_types, _)| {
-            let mut fields_name = Vec::with_capacity(tuple_types.len());
-            let mut fields_type = Vec::with_capacity(tuple_types.len());
-            for tuple_type in tuple_types {
-                if let Some(field_name) = tuple_type.0 {
-                    fields_name.push(field_name.name);
-                }
-                fields_type.push(tuple_type.1);
-            }
-            if fields_name.is_empty() {
-                TypeName::Tuple {
-                    fields_name: None,
-                    fields_type,
-                }
-            } else {
-                TypeName::Tuple {
-                    fields_name: Some(fields_name),
-                    fields_type,
-                }
+        rule! { TUPLE ~ "(" ~ #comma_separated_list1(type_name) ~ ")" },
+        |(_, _, fields_type, _)| TypeName::Tuple {
+            fields_name: None,
+            fields_type,
+        },
+    );
+    let ty_named_tuple = map(
+        rule! { TUPLE ~ "(" ~ #comma_separated_list1(rule! { #ident ~ #type_name }) ~ ")" },
+        |(_, _, fields, _)| {
+            let (fields_name, fields_type) =
+                fields.into_iter().map(|(name, ty)| (name.name, ty)).unzip();
+            TypeName::Tuple {
+                fields_name: Some(fields_name),
+                fields_type,
             }
         },
     );
@@ -1461,7 +1455,8 @@ pub fn type_name(i: Input) -> IResult<TypeName> {
             | #ty_decimal
             | #ty_array
             | #ty_map
-            | #ty_tuple
+            | #ty_tuple : "TUPLE(<type>, ...)"
+            | #ty_named_tuple : "TUPLE(<name> <type>, ...)"
             | #ty_date
             | #ty_datetime
             | #ty_string
@@ -1479,26 +1474,6 @@ pub fn type_name(i: Input) -> IResult<TypeName> {
     )(i)
 }
 
-pub fn tuple_types(i: Input) -> IResult<(Option<Identifier>, TypeName)> {
-    let tuple_types = map(
-        rule! {
-           #type_name
-        },
-        |type_name| (None, type_name),
-    );
-    let named_tuple_types = map(
-        rule! {
-           #ident ~ #type_name
-        },
-        |(name, type_name)| (Some(name), type_name),
-    );
-
-    rule!(
-        #tuple_types
-        | #named_tuple_types
-    )(i)
-}
-
 pub fn interval_kind(i: Input) -> IResult<IntervalKind> {
     alt((
         value(IntervalKind::Year, rule! { YEAR }),

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

@@ -402,6 +402,7 @@ fn test_statement_error() {
         r#"create table a (c varch)"#,
         r#"create table a (c tuple())"#,
         r#"create table a (c decimal)"#,
+        r#"create table a (b tuple(c int, uint64));"#,
         r#"drop table if a.b"#,
         r#"truncate table a.b.c.d"#,
         r#"truncate a"#,

src/query/ast/tests/it/testdata/statement-error.txt

@@ -65,6 +65,23 @@ error:
   | while parsing `CREATE TABLE [IF NOT EXISTS] [<database>.]<table> [<source>] [<table_options>]`
 
 
+---------- Input ----------
+create table a (b tuple(c int, uint64));
+---------- Output ---------
+error: 
+  --> SQL:1:38
+  |
+1 | create table a (b tuple(c int, uint64));
+  | ------          - -----              ^
+  | |               | |                  |
+  | |               | |                  expected `BOOLEAN`, `BOOL`, `UINT8`, `TINYINT`, `UINT16`, `SMALLINT`, or 30 more ...
+  | |               | |                  while parsing type name
+  | |               | while parsing TUPLE(<name> <type>, ...)
+  | |               | while parsing type name
+  | |               while parsing `<column name> <type> [DEFAULT <default value>] [COMMENT '<comment>']`
+  | while parsing `CREATE TABLE [IF NOT EXISTS] [<database>.]<table> [<source>] [<table_options>]`
+
+
 ---------- Input ----------
 drop table if a.b
 ---------- Output ---------

tests/sqllogictests/suites/base/03_common/03_0026_insert_into_tuple

@@ -25,6 +25,9 @@ select t.1, t.2, t.3, t.4, t.5, t.6 from t1
 1 100 12.34 abc 2020-01-01 2020-01-01 00:00:00.000000
 0 200 -25.73 xyz 2022-06-01 2022-06-01 12:00:00.000000
 
+statement error 1005
+CREATE TABLE IF NOT EXISTS t2(t Tuple(a Bool, Int64)) Engine = Fuse
+
 statement ok
 CREATE TABLE IF NOT EXISTS t2(id Int, t Tuple(a Bool, b Int64, c Float64, d String, e Date, f Timestamp)) Engine = Fuse