[CALCITE-4207] Validation fails for positional aggregate with current_date in 'case' expression

ihuzenko · ihuzenko · commit bc13e00ae59c · 2020-09-02T12:39:46.000+03:00
diff --git a/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorUtil.java b/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorUtil.java
@@ -846,7 +846,7 @@ private static ImmutableBitSet analyzeGroupExpr(SqlValidatorScope scope,
       }
     }
 
-    final int ref = lookupGroupExpr(groupAnalyzer, groupExpr);
+    final int ref = lookupGroupExpr(groupAnalyzer, expandedGroupExpr);
     if (expandedGroupExpr instanceof SqlIdentifier) {
       // SQL 2003 does not allow expressions of column references
       SqlIdentifier expr = (SqlIdentifier) expandedGroupExpr;
diff --git a/core/src/test/java/org/apache/calcite/test/SqlValidatorTest.java b/core/src/test/java/org/apache/calcite/test/SqlValidatorTest.java
@@ -11685,6 +11685,19 @@ private void checkCustomColumnResolving(String table) {
             + "MYFUN\\(<NUMERIC>, <NUMERIC>\\).*");
   }
 
+  @Test void testPositionalAggregateWithExpandedCurrentDateFunction() {
+    SqlConformance defaultPlusOrdinalGroupBy =
+        new SqlDelegatingConformance(SqlConformanceEnum.DEFAULT) {
+          @Override public boolean isGroupByOrdinal() {
+            return true;
+          }
+        };
+    sql("SELECT HIREDATE >= CURRENT_DATE, COUNT(*) "
+        + "FROM EMP GROUP BY 1")
+        .withConformance(defaultPlusOrdinalGroupBy)
+        .ok();
+  }
+
   @Test void testValidatorReportsOriginalQueryUsingReader()
       throws Exception {
     final String sql = "select a from b";
diff --git a/core/src/test/java/org/apache/calcite/test/catalog/Fixture.java b/core/src/test/java/org/apache/calcite/test/catalog/Fixture.java
@@ -35,7 +35,7 @@ final class Fixture extends AbstractFixture {
   final RelDataType bigintType = sqlType(SqlTypeName.BIGINT);
   final RelDataType decimalType = sqlType(SqlTypeName.DECIMAL);
   final RelDataType varcharType = sqlType(SqlTypeName.VARCHAR);
-  final RelDataType varcharTypeNull = sqlType(SqlTypeName.VARCHAR);
+  final RelDataType varcharTypeNull = nullable(varcharType);
   final RelDataType varchar5Type = sqlType(SqlTypeName.VARCHAR, 5);
   final RelDataType varchar10Type = sqlType(SqlTypeName.VARCHAR, 10);
   final RelDataType varchar10TypeNull = nullable(varchar10Type);

Original file line number	Diff line number	Diff line change
`@@ -846,7 +846,7 @@ private static ImmutableBitSet analyzeGroupExpr(SqlValidatorScope scope,`
`846`	`846`	`}`
`847`	`847`	`}`
`848`	`848`
`849`		`- final int ref = lookupGroupExpr(groupAnalyzer, groupExpr);`
	`849`	`+ final int ref = lookupGroupExpr(groupAnalyzer, expandedGroupExpr);`
`850`	`850`	`if (expandedGroupExpr instanceof SqlIdentifier) {`
`851`	`851`	`// SQL 2003 does not allow expressions of column references`
`852`	`852`	`SqlIdentifier expr = (SqlIdentifier) expandedGroupExpr;`