Resove conflicts

Author: xiedeyantu

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

@@ -258,7 +258,7 @@ names, is(
 
     // To verify that the exclude list contains all columns in the table
     fixture.withSql("select ^*^ exclude(deptno, name) from dept")
-        .fails("SELECT \\* EXCLUDE list cannot exclude all columns");
+        .fails("SELECT \\* EXCLUDE/EXCEPT list cannot exclude all columns");
   }
 
   /** Tests that DATEADD, DATEDIFF, DATEPART, DATE_PART allow custom time

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

@@ -807,13 +807,13 @@ ExInst<CalciteException> illegalArgumentForTableFunctionCall(String a0,
   @BaseMessage("SELECT * requires a FROM clause")
   ExInst<SqlValidatorException> selectStarRequiresFrom();
 
-  @BaseMessage("EXCLUDE clause must follow a STAR expression")
+  @BaseMessage("EXCLUDE/EXCEPT clause must follow a STAR expression")
   ExInst<CalciteException> selectExcludeRequiresStar();
 
   @BaseMessage("SELECT * EXCLUDE/EXCEPT list contains unknown column(s): {0}")
   ExInst<SqlValidatorException> selectStarExcludeListContainsUnknownColumns(String columns);
 
-  @BaseMessage("SELECT * EXCLUDE list cannot exclude all columns")
+  @BaseMessage("SELECT * EXCLUDE/EXCEPT list cannot exclude all columns")
   ExInst<SqlValidatorException> selectStarExcludeCannotExcludeAllColumns();
 
   @BaseMessage("Group function ''{0}'' can only appear in GROUP BY clause")

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

@@ -266,10 +266,9 @@ CannotStreamResultsForNonStreamingInputs=Cannot stream results of a query with n
 MinusNotAllowed=MINUS is not allowed under the current SQL conformance level
 SelectMissingFrom=SELECT must have a FROM clause
 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
+SelectExcludeRequiresStar=EXCLUDE/EXCEPT clause must follow a STAR expression
 SelectStarExcludeListContainsUnknownColumns=SELECT * EXCLUDE/EXCEPT list contains unknown column(s): {0}
+SelectStarExcludeCannotExcludeAllColumns=SELECT * EXCLUDE/EXCEPT list cannot exclude all columns
 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