[CALCITE-7331] Support the alias form SELECT * EXCEPT() for SELECT * EXCLUDE()

Author: xiedeyantu

babel/src/test/java/org/apache/calcite/test/BabelTest.java

@@ -181,7 +181,21 @@ names, is(
         });
 
     fixture.withSql("select * exclude (empno, ^foo^) from emp")
-        .fails("SELECT \\* EXCLUDE list contains unknown column\\(s\\): FOO");
+        .fails("SELECT \\* EXCLUDE/EXCEPT list contains unknown column\\(s\\): FOO");
+
+    // Alias form: EXCEPT behaves the same as EXCLUDE
+    fixture.withSql("select * except(empno, deptno) from emp")
+        .type(type -> {
+          final List<String> names = type.getFieldList().stream()
+              .map(RelDataTypeField::getName)
+              .collect(Collectors.toList());
+          assertThat(
+              names, is(
+                  ImmutableList.of("ENAME", "JOB", "MGR", "HIREDATE", "SAL", "COMM", "SLACKER")));
+        });
+
+    fixture.withSql("select * except (empno, ^foo^) from emp")
+        .fails("SELECT \\* EXCLUDE/EXCEPT list contains unknown column\\(s\\): FOO");
 
     fixture.withSql("select e.* exclude(e.empno, e.ename, e.job, e.mgr)"
             + " from emp e join dept d on e.deptno = d.deptno")
@@ -196,7 +210,23 @@ names, is(
 
     fixture.withSql("select e.* exclude(e.empno, e.ename, e.job, e.mgr, ^d.deptno^)"
             + " from emp e join dept d on e.deptno = d.deptno")
-        .fails("SELECT \\* EXCLUDE list contains unknown column\\(s\\): D.DEPTNO");
+        .fails("SELECT \\* EXCLUDE/EXCEPT list contains unknown column\\(s\\): D.DEPTNO");
+
+    // Alias form: EXCEPT for table-qualified star
+    fixture.withSql("select e.* except(e.empno, e.ename, e.job, e.mgr)"
+            + " from emp e join dept d on e.deptno = d.deptno")
+        .type(type -> {
+          final List<String> names = type.getFieldList().stream()
+              .map(RelDataTypeField::getName)
+              .collect(Collectors.toList());
+          assertThat(
+              names, is(
+                  ImmutableList.of("HIREDATE", "SAL", "COMM", "DEPTNO", "SLACKER")));
+        });
+
+    fixture.withSql("select e.* except(e.empno, e.ename, e.job, e.mgr, ^d.deptno^)"
+            + " from emp e join dept d on e.deptno = d.deptno")
+        .fails("SELECT \\* EXCLUDE/EXCEPT list contains unknown column\\(s\\): D.DEPTNO");
 
     fixture.withSql("select e.* exclude(e.empno, e.ename, e.job, e.mgr), d.* exclude(d.name)"
             + " from emp e join dept d on e.deptno = d.deptno")

core/src/main/codegen/templates/Parser.jj

@@ -2020,7 +2020,7 @@ SqlNodeList StarExcludeList() :
     SqlIdentifier id;
 }
 {
-    <EXCLUDE> <LPAREN> { s = span(); }
+    ( <EXCLUDE> | <EXCEPT> ) <LPAREN> { s = span(); }
     id = CompoundIdentifier() {
         list.add(id);
     }

core/src/main/java/org/apache/calcite/runtime/CalciteResource.java

@@ -810,7 +810,7 @@ ExInst<CalciteException> illegalArgumentForTableFunctionCall(String a0,
   @BaseMessage("EXCLUDE clause must follow a STAR expression")
   ExInst<CalciteException> selectExcludeRequiresStar();
 
-  @BaseMessage("SELECT * EXCLUDE list contains unknown column(s): {0}")
+  @BaseMessage("SELECT * EXCLUDE/EXCEPT list contains unknown column(s): {0}")
   ExInst<SqlValidatorException> selectStarExcludeListContainsUnknownColumns(String columns);
 
   @BaseMessage("SELECT * EXCLUDE list cannot exclude all columns")

core/src/main/resources/org/apache/calcite/runtime/CalciteResource.properties

@@ -269,6 +269,7 @@ SelectStarRequiresFrom=SELECT * requires a FROM clause
 SelectExcludeRequiresStar=EXCLUDE clause must follow a STAR expression
 SelectStarExcludeListContainsUnknownColumns=SELECT * EXCLUDE list contains unknown column(s): {0}
 SelectStarExcludeCannotExcludeAllColumns=SELECT * EXCLUDE list cannot exclude all columns
+SelectStarExcludeListContainsUnknownColumns=SELECT * EXCLUDE/EXCEPT list contains unknown column(s): {0}
 GroupFunctionMustAppearInGroupByClause=Group function ''{0}'' can only appear in GROUP BY clause
 AuxiliaryWithoutMatchingGroupCall=Call to auxiliary group function ''{0}'' must have matching call to group function ''{1}'' in GROUP BY clause
 PivotAggMalformed=Measure expression in PIVOT must use aggregate function

site/_docs/reference.md

@@ -224,7 +224,7 @@ starWithExclude:
 
 Note:
 
-* `SELECT * EXCLUDE (...)` is recognized only when the Babel parser is enabled. It sets the generated parser configuration flag `includeStarExclude` to `true` (the standard parser leaves that flag `false`), which allows a `STAR` token followed by `EXCLUDE` and a parenthesized identifier list to be parsed into a `SqlStarExclude` node and ensures validators respect the exclusion list when expanding the projection. Reusing the same parser configuration elsewhere enables the same syntax for other components that need it.
+* `SELECT * EXCLUDE (...)` is recognized only when the Babel parser is enabled. It sets the generated parser configuration flag `includeStarExclude` to `true` (the standard parser leaves that flag `false`), which allows a `STAR` token followed by `EXCLUDE` (or the alias `EXCEPT`) and a parenthesized identifier list to be parsed into a `SqlStarExclude` node and ensures validators respect the exclusion list when expanding the projection. Reusing the same parser configuration elsewhere enables the same syntax for other components that need it.
 
 projectItem:
       expression [ [ AS ] columnAlias ]