in work

Author: waralexrom

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

@@ -1899,53 +1899,8 @@ export class BaseQuery {
    */
   intervalAndMinimalTimeUnit(interval) {
     const intervalParsed = parseSqlInterval(interval);
-    const intKeys = Object.keys(intervalParsed).length;
-
-    if (intervalParsed.year && intKeys === 1) {
-      return [interval, 'year'];
-    } else if (intervalParsed.year && intervalParsed.month && intKeys === 2) {
-      return [interval, 'month'];
-    } else if (intervalParsed.year && intervalParsed.month && intervalParsed.day && intKeys === 3) {
-      return [interval, 'day'];
-    } else if (intervalParsed.year && intervalParsed.month && intervalParsed.day && intervalParsed.hour && intKeys === 4) {
-      return [interval, 'hour'];
-    } else if (intervalParsed.year && intervalParsed.month && intervalParsed.day && intervalParsed.hour && intervalParsed.minute && intKeys === 5) {
-      return [interval, 'minute'];
-    } else if (intervalParsed.year && intervalParsed.month && intervalParsed.day && intervalParsed.hour && intervalParsed.minute && intervalParsed.second && intKeys === 6) {
-      return [interval, 'second'];
-    } else if (intervalParsed.quarter && intKeys === 1) {
-      return [interval, 'quarter'];
-    } else if (intervalParsed.month && intKeys === 1) {
-      return [interval, 'month'];
-    } else if (intervalParsed.month && intervalParsed.day && intKeys === 2) {
-      return [interval, 'day'];
-    } else if (intervalParsed.month && intervalParsed.day && intervalParsed.hour && intKeys === 3) {
-      return [interval, 'hour'];
-    } else if (intervalParsed.month && intervalParsed.day && intervalParsed.hour && intervalParsed.minute && intKeys === 4) {
-      return [interval, 'minute'];
-    } else if (intervalParsed.month && intervalParsed.day && intervalParsed.hour && intervalParsed.minute && intervalParsed.second && intKeys === 5) {
-      return [interval, 'second'];
-    } else if (intervalParsed.week && intKeys === 1) {
-      return [interval, 'week'];
-    } else if (intervalParsed.day && intKeys === 1) {
-      return [interval, 'day'];
-    } else if (intervalParsed.day && intervalParsed.hour && intKeys === 2) {
-      return [interval, 'hour'];
-    } else if (intervalParsed.day && intervalParsed.hour && intervalParsed.minute && intKeys === 3) {
-      return [interval, 'minute'];
-    } else if (intervalParsed.day && intervalParsed.hour && intervalParsed.minute && intervalParsed.second && intKeys === 4) {
-      return [interval, 'second'];
-    } else if (intervalParsed.hour && intervalParsed.minute && intKeys === 2) {
-      return [interval, 'minute'];
-    } else if (intervalParsed.hour && intervalParsed.minute && intervalParsed.second && intKeys === 3) {
-      return [interval, 'second'];
-    } else if (intervalParsed.minute && intervalParsed.second && intKeys === 2) {
-      return [interval, 'second'];
-    }
-
-    // No need to support microseconds.
-
-    throw new Error(`Cannot transform interval expression "${interval}"`);
+    const minGranularity = this.diffTimeUnitForInterval(interval);
+    return [interval, minGranularity];
   }
 
   commonQuery() {

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

@@ -83,7 +83,7 @@ export class BigqueryQuery extends BaseQuery {
    * @see https://cloud.google.com/bigquery/docs/reference/standard-sql/data-types#interval_type
    * It returns a tuple of (formatted interval, timeUnit to use in datediff functions)
    */
-  public formatInterval(interval: string): [string, string] {
+  private formatInterval(interval: string): [string, string] {
     const intervalParsed = parseSqlInterval(interval);
     const intKeys = Object.keys(intervalParsed).length;
 

rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_call.rs

@@ -329,6 +329,8 @@ impl SqlCall {
             let arg = MemberSqlArg::String(visitor.apply(&v, node_processor.clone(), templates)?);
             res.properties.insert(k.clone(), arg);
         }
+        let string_fn = visitor.apply(&dep.base_symbol, node_processor.clone(), templates)?;
+        res.to_string_fn = Some(string_fn);
         Ok(MemberSqlArg::Struct(res))
     }
 

rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/evaluate_sql.rs

@@ -24,7 +24,7 @@ impl SqlNode for EvaluateSqlNode {
         node_processor: Rc<dyn SqlNode>,
         templates: &PlanSqlTemplates,
     ) -> Result<String, CubeError> {
-        match node.as_ref() {
+        let res = match node.as_ref() {
             MemberSymbol::Dimension(ev) => {
                 let res = ev.evaluate_sql(
                     visitor,
@@ -81,13 +81,17 @@ impl SqlNode for EvaluateSqlNode {
                 templates,
             ),
             MemberSymbol::CubeName(ev) => ev.evaluate_sql(),
-            MemberSymbol::MemberExpression(e) => e.evaluate_sql(
-                visitor,
-                node_processor.clone(),
-                query_tools.clone(),
-                templates,
-            ),
-        }
+            MemberSymbol::MemberExpression(e) => {
+                let res = e.evaluate_sql(
+                    visitor,
+                    node_processor.clone(),
+                    query_tools.clone(),
+                    templates,
+                )?;
+                Ok(res)
+            }
+        }?;
+        Ok(res)
     }
 
     fn as_any(self: Rc<Self>) -> Rc<dyn Any> {