feat(tesseract): Allow named calendar timeshifts for common intervals

Author: KSDaemon

packages/cubejs-schema-compiler/src/compiler/CubeValidator.ts

@@ -626,15 +626,26 @@ const MeasuresSchema = Joi.object().pattern(identifierRegex, Joi.alternatives().
   ]
 ));
 
-const CalendarTimeShiftItem = Joi.object({
-  name: identifier,
-  interval: regexTimeInterval,
-  type: Joi.string().valid('next', 'prior'),
-  sql: Joi.func().required(),
-})
-  .or('name', 'interval')
-  .with('interval', 'type')
-  .with('type', 'interval');
+const CalendarTimeShiftItem = Joi.alternatives().try(
+  Joi.object({
+    name: identifier.required(),
+    interval: regexTimeInterval.required(),
+    type: Joi.string().valid('next', 'prior').required(),
+    sql: Joi.forbidden()
+  }),
+  Joi.object({
+    name: identifier.required(),
+    sql: Joi.func().required(),
+    interval: Joi.forbidden(),
+    type: Joi.forbidden()
+  }),
+  Joi.object({
+    interval: regexTimeInterval.required(),
+    type: Joi.string().valid('next', 'prior').required(),
+    sql: Joi.func().required(),
+    name: Joi.forbidden()
+  })
+);
 
 const DimensionsSchema = Joi.object().pattern(identifierRegex, Joi.alternatives().try(
   inherit(BaseDimensionWithoutSubQuery, {

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

@@ -38,12 +38,16 @@ impl PhysicalPlanBuilderContext {
 
         for (key, shift) in self.time_shifts.dimensions_shifts.iter() {
             if let Ok(dimension) = shift.dimension.as_dimension() {
+                // 1. Shift might be referenced by name or by interval
+                // 2. Shift body might be defined in calendar dimension as:
+                //      * sql reference
+                //      * interval + type
+
                 if let Some(dim_shift_name) = &shift.name {
                     if let Some((dim_key, cts)) =
                         dimension.calendar_time_shift_for_named_interval(dim_shift_name)
                     {
                         calendar_time_shifts.insert(dim_key.clone(), cts.clone());
-                        continue;
                     } else if let Some(_calendar_pk) = dimension.time_shift_pk_full_name() {
                         return Err(CubeError::internal(format!(
                             "Time shift with name {} not found for dimension {}",
@@ -56,16 +60,15 @@ impl PhysicalPlanBuilderContext {
                         dimension.calendar_time_shift_for_interval(dim_shift_interval)
                     {
                         calendar_time_shifts.insert(dim_key.clone(), cts.clone());
-                        continue;
                     } else if let Some(calendar_pk) = dimension.time_shift_pk_full_name() {
                         let mut shift = shift.clone();
                         shift.interval = Some(dim_shift_interval.inverse());
                         time_shifts.insert(calendar_pk, shift.clone());
-                        continue;
                     }
                 }
+            } else {
+                time_shifts.insert(key.clone(), shift.clone());
             }
-            time_shifts.insert(key.clone(), shift.clone());
         }
 
         let common_time_shifts = TimeShiftState {

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

@@ -54,6 +54,9 @@ impl SqlNode for CalendarTimeShiftSqlNode {
                                 query_tools.clone(),
                                 templates,
                             )?
+                        } else if let Some (interval) = &shift.interval {
+                            let res = templates.add_timestamp_interval(input, interval.inverse().to_sql())?;
+                            format!("({})", res)
                         } else {
                             input
                         }