fix

Author: waralexrom

packages/cubejs-schema-compiler/src/adapter/BaseQuery.js

@@ -1117,6 +1117,10 @@ export class BaseQuery {
     return `${date} + interval ${intervalStr}`;
   }
 
+  supportGeneratedSeriesForCustomTd() {
+    return false;
+  }
+
   /**
    * @param {string} interval
    * @returns {string}

packages/cubejs-schema-compiler/src/adapter/PostgresQuery.ts

@@ -57,6 +57,10 @@ export class PostgresQuery extends BaseQuery {
     return `round(hll_cardinality(hll_add_agg(hll_hash_any(${sql}))))`;
   }
 
+  public supportGeneratedSeriesForCustomTd() {
+    return true;
+  }
+
   public sqlTemplates() {
     const templates = super.sqlTemplates();
     // eslint-disable-next-line no-template-curly-in-string
@@ -81,11 +85,9 @@ export class PostgresQuery extends BaseQuery {
     templates.types.float = 'REAL';
     templates.types.double = 'DOUBLE PRECISION';
     templates.types.binary = 'BYTEA';
-    templates.tesseract.support_generated_series_for_custom_td = 'YES';
     templates.operators.is_not_distinct_from = 'IS NOT DISTINCT FROM';
     templates.statements.generated_time_series_select = 'SELECT {{ date_from }} AS "date_from",\n' +
       '{{ date_to }} AS "date_to" \n' +
-      // 'd + interval {{ granularity }} - interval \'1 millisecond\' AS "date_to" \n' +
       'FROM generate_series({{ start }}::timestamp, {{ end }}:: timestamp, {{ granularity }}::interval) d ';
     templates.statements.generated_time_series_with_cte_range_source = 'SELECT d AS "date_from",\n' +
       'd + interval {{ granularity }} - interval \'1 millisecond\' AS "date_to" \n' +

packages/cubejs-schema-compiler/src/adapter/PrestodbQuery.ts

@@ -122,6 +122,10 @@ export class PrestodbQuery extends BaseQuery {
     return `approx_distinct(${sql})`;
   }
 
+  public supportGeneratedSeriesForCustomTd() {
+    return true;
+  }
+
   protected limitOffsetClause(limit, offset) {
     const limitClause = limit != null ? ` LIMIT ${limit}` : '';
     const offsetClause = offset != null ? ` OFFSET ${offset}` : '';
@@ -155,7 +159,6 @@ export class PrestodbQuery extends BaseQuery {
     // Presto intervals have a YearMonth or DayTime type variants, but no universal type
     delete templates.types.interval;
     templates.types.binary = 'VARBINARY';
-    templates.tesseract.support_generated_series_for_custom_td = 'YES';
     templates.tesseract.ilike = 'LOWER({{ expr }}) {% if negated %}NOT {% endif %} LIKE {{ pattern }}';
     templates.filters.like_pattern = 'CONCAT({% if start_wild %}\'%\'{% else %}\'\'{% endif %}, LOWER({{ value }}), {% if end_wild %}\'%\'{% else %}\'\'{% endif %}) ESCAPE \'\\\'';
     templates.statements.time_series_select = 'SELECT from_iso8601_timestamp(dates.f) date_from, from_iso8601_timestamp(dates.t) date_to \n' +

rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/driver_tools.rs

@@ -31,6 +31,7 @@ pub trait DriverTools {
     fn hll_merge(&self, sql: String) -> Result<String, CubeError>;
     fn hll_cardinality_merge(&self, sql: String) -> Result<String, CubeError>;
     fn count_distinct_approx(&self, sql: String) -> Result<String, CubeError>;
+    fn support_generated_series_for_custom_td(&self) -> Result<bool, CubeError>;
     fn date_bin(
         &self,
         interval: String,

rust/cubesqlplanner/cubesqlplanner/src/physical_plan_builder/builder.rs

@@ -967,7 +967,7 @@ impl PhysicalPlanBuilder {
 
         let ts_date_range = if self
             .plan_sql_templates
-            .supports_generated_time_series(granularity_obj.is_predefined_granularity())
+            .supports_generated_time_series(granularity_obj.is_predefined_granularity())?
         {
             if let Some(date_range) = time_dimension_symbol
                 .get_range_for_time_series(date_range, self.query_tools.timezone())?

rust/cubesqlplanner/cubesqlplanner/src/plan/time_series.rs

@@ -40,7 +40,7 @@ impl TimeSeries {
     }
 
     pub fn to_sql(&self, templates: &PlanSqlTemplates) -> Result<String, CubeError> {
-        if templates.supports_generated_time_series(self.granularity.is_predefined_granularity()) {
+        if templates.supports_generated_time_series(self.granularity.is_predefined_granularity())? {
             let interval_description = templates
                 .interval_and_minimal_time_unit(self.granularity.granularity_interval().to_sql())?;
             if interval_description.len() != 2 {

rust/cubesqlplanner/cubesqlplanner/src/planner/sql_templates/plan.rs

@@ -426,13 +426,17 @@ impl PlanSqlTemplates {
             .contains_template("operators/is_not_distinct_from")
     }
 
-    pub fn supports_generated_time_series(&self, predifined_granularity: bool) -> bool {
-        self.render
+    pub fn supports_generated_time_series(
+        &self,
+        predifined_granularity: bool,
+    ) -> Result<bool, CubeError> {
+        Ok(self
+            .render
             .contains_template("statements/generated_time_series_select")
             && (predifined_granularity
                 || self
-                    .render
-                    .contains_template("tesseract/support_generated_series_for_custom_td"))
+                    .driver_tools()
+                    .support_generated_series_for_custom_td()?))
     }
 
     pub fn generated_time_series_select(