only use exclude keyword

datafuselabs · Nov 29, 2022 · 87a7368 · 87a7368
1 parent a876f0a
commit 87a7368
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/src/query/ast/src/parser/query.rs b/src/query/ast/src/parser/query.rs
@@ -106,7 +106,7 @@ pub fn exclude_col(i: Input) -> IResult<ExcludeCol> {
 pub fn select_target(i: Input) -> IResult<SelectTarget> {
     let qualified_wildcard = map(
         rule! {
-            ( #ident ~ "." ~ ( #ident ~ "." )? )? ~ "*" ~ ( ( EXCEPT | EXCLUDE ) ~ #exclude_col )?
+            ( #ident ~ "." ~ ( #ident ~ "." )? )? ~ "*" ~ ( EXCLUDE ~ #exclude_col )?
         },
         |(res, _, opt_exclude)| match res {
             Some((fst, _, Some((snd, _)))) => SelectTarget::QualifiedName {

diff --git a/src/query/ast/tests/it/parser.rs b/src/query/ast/tests/it/parser.rs
@@ -418,7 +418,7 @@ fn test_query() {
     let mut mint = Mint::new("tests/it/testdata");
     let mut file = mint.new_goldenfile("query.txt").unwrap();
     let cases = &[
-        r#"select * except c1, b.* except (c2, c3, c4) from customer inner join orders on a = b limit 1"#,
+        r#"select * exclude c1, b.* exclude (c2, c3, c4) from customer inner join orders on a = b limit 1"#,
         r#"select * from customer inner join orders"#,
         r#"select * from customer cross join orders"#,
         r#"select * from customer inner join orders on a = b limit 1"#,

diff --git a/...es/base/03_dml/03_0034_select_except_list → ...s/base/03_dml/03_0034_select_exclude_list b/...es/base/03_dml/03_0034_select_except_list → ...s/base/03_dml/03_0034_select_exclude_list
@@ -55,14 +55,14 @@ insert into default.t1 values(2, (200,200));
 
 
 statement query I
-select * except c1 from db.t;
+select * exclude c1 from db.t;
 
 ----
 1
 
 
 statement query T
-select * except (id) from db.t;
+select * exclude (id) from db.t;
 
 ----
 (0,0)
@@ -76,75 +76,75 @@ select t.* exclude (id) from db.t;
 
 
 statement query T
-select db.t.* except (id) from db.t;
+select db.t.* exclude (id) from db.t;
 
 ----
 (0,0)
 
 
 statement error 1065
-select db.t.* except (id, c1) from db.t;
+select db.t.* exclude (id, c1) from db.t;
 
 
 statement query T
-select c.* except (id) from db.t as c;
+select c.* exclude (id) from db.t as c;
 
 ----
 (0,0)
 
 
 statement error 1065
-select db.c.* except (id) from db.t as c;
+select db.c.* exclude (id) from db.t as c;
 
 
 statement error 1065
-select * except id from (select t.id as id, t.c1 as id from db.t) t1;
+select * exclude id from (select t.id as id, t.c1 as id from db.t) t1;
 
 
 statement error 1065
-select t1.* except id from (select t.id as id, t.c1 as id from db.t) t1;
+select t1.* exclude id from (select t.id as id, t.c1 as id from db.t) t1;
 
 
 statement query ITITITIIT
-select *, t.* except c1, t1.* except (c1), t2.* except id from db.t join db.t1 on t.id != t1.id join default.t as t2 on t.id=t2.id;
+select *, t.* exclude c1, t1.* exclude (c1), t2.* exclude id from db.t join db.t1 on t.id != t1.id join default.t as t2 on t.id=t2.id;
 
 ----
 1 (0,0)    2 (0,0)    1 (100,100)    1    2 (100,100)
 
 
 statement query IT
-select db.t.* except (c1), default.t1.* except id from db.t join default.t1;
+select db.t.* exclude (c1), default.t1.* exclude id from db.t join default.t1;
 
 ----
 1 (200,200)
 
 
 statement error 1065
-select * except id from default.t1 join db.t;
+select * exclude id from default.t1 join db.t;
 
 
 statement error 1065
-select db.t.* except (c1), default.t1.* except idcc from db.t join default.t1;
+select db.t.* exclude (c1), default.t1.* exclude idcc from db.t join default.t1;
 
 
 statement error 1065
-select * except c10 from (select * from db.t) t1;
+select * exclude c10 from (select * from db.t) t1;
 
 
 statement error 1065
-select * except (id, c1) from (select * from db.t) t1;
+select * exclude (id, c1) from (select * from db.t) t1;
 
 
 statement error 1065
-select t1.* except (id, c1) from (select * from db.t) t1;
+select t1.* exclude (id, c1) from (select * from db.t) t1;
 
 
 statement error 1065
-select * except (c1, c1) from db.t;
+select * exclude (c1, c1) from db.t;
 
 
 statement error 1065
-select * except (id, id) from db.t;
+select * exclude (id, id) from db.t;
 
 
 statement ok