fix temporal extent for date columns

Author: azahnen

xtraplatform-features-sql/src/main/java/de/ii/xtraplatform/features/sql/app/AggregateStatsQueryGenerator.java

@@ -79,9 +79,11 @@ public String getTemporalExtentQuery(
 
     String mainTable = String.format("%s %s", mainSchema.getName(), aliases.get(0));
 
+    SqlQueryColumn instantColumnDatetime = SqlQueryColumnOperations.dateToDatetime(instantColumn);
+
     String column =
         SqlQueryColumnOperations.getQualifiedColumnResolved(
-            temporalAlias, instantColumn, sqlDialect);
+            temporalAlias, instantColumnDatetime, sqlDialect);
 
     String join = JoinGenerator.getJoins(instant, aliases, filterEncoder);
 
@@ -107,13 +109,18 @@ public String getTemporalExtentQuery(
 
       String mainTable = String.format("%s %s", mainSchema.getName(), aliases.get(0));
 
+      SqlQueryColumn intervalStartColumnColumnDatetime =
+          SqlQueryColumnOperations.dateToDatetime(intervalStartColumn);
+      SqlQueryColumn intervalEndColumnDatetime =
+          SqlQueryColumnOperations.dateToDatetime(intervalEndColumn);
+
       String columnStart =
           SqlQueryColumnOperations.getQualifiedColumnResolved(
-              temporalAlias, intervalStartColumn, sqlDialect);
+              temporalAlias, intervalStartColumnColumnDatetime, sqlDialect);
 
       String columnEnd =
           SqlQueryColumnOperations.getQualifiedColumnResolved(
-              temporalAlias, intervalEndColumn, sqlDialect);
+              temporalAlias, intervalEndColumnDatetime, sqlDialect);
 
       String join = JoinGenerator.getJoins(intervalStart, aliases, filterEncoder);
 

xtraplatform-features-sql/src/main/java/de/ii/xtraplatform/features/sql/app/SqlQueryColumnOperations.java

@@ -8,6 +8,8 @@
 package de.ii.xtraplatform.features.sql.app;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap.Builder;
+import de.ii.xtraplatform.features.sql.domain.ImmutableSqlQueryColumn;
 import de.ii.xtraplatform.features.sql.domain.SqlDialect;
 import de.ii.xtraplatform.features.sql.domain.SqlQueryColumn;
 import de.ii.xtraplatform.features.sql.domain.SqlQueryColumn.Operation;
@@ -71,4 +73,23 @@ static String getQualifiedColumnResolved(
     }
     return name;
   }
+
+  static SqlQueryColumn dateToDatetime(SqlQueryColumn column) {
+    if (!column.getOperations().containsKey(Operation.DATE)) {
+      return column;
+    }
+    Builder<Operation, String[]> ops =
+        ImmutableMap.<Operation, String[]>builder()
+            .put(
+                Operation.DATETIME,
+                column.getOperationParameters(Operation.DATE).toArray(new String[0]));
+
+    for (Map.Entry<Operation, String[]> entry : column.getOperations().entrySet()) {
+      if (entry.getKey() != Operation.DATE) {
+        ops.put(entry);
+      }
+    }
+
+    return new ImmutableSqlQueryColumn.Builder().from(column).operations(ops.build()).build();
+  }
 }