in work

waralexrom · waralexrom · commit abc8c6d113a4 · 2025-05-19T13:06:54.000+02:00
diff --git a/packages/cubejs-testing-drivers/fixtures/athena.json b/packages/cubejs-testing-drivers/fixtures/athena.json
@@ -150,6 +150,7 @@
     "---------------------------------------",
     "querying BigECommerce: rolling window by 2 day without date range",
     "querying BigECommerce: rolling window by 2 month without date range",
+    "querying BigECommerce: rolling window YTD",
     "querying BigECommerce: rolling window YTD without date range",
     "--------------------",
 
diff --git a/packages/cubejs-testing-drivers/fixtures/clickhouse.json b/packages/cubejs-testing-drivers/fixtures/clickhouse.json
@@ -179,6 +179,7 @@
     "---------------------------------------",
     "querying BigECommerce: rolling window by 2 day without date range",
     "querying BigECommerce: rolling window by 2 month without date range",
+    "querying BigECommerce: rolling window YTD",
     "querying BigECommerce: rolling window YTD without date range",
     "--------------------",
 
diff --git a/packages/cubejs-testing-drivers/fixtures/databricks-jdbc.json b/packages/cubejs-testing-drivers/fixtures/databricks-jdbc.json
@@ -211,6 +211,7 @@
     "---------------------------------------",
     "querying BigECommerce: rolling window by 2 day without date range",
     "querying BigECommerce: rolling window by 2 month without date range",
+    "querying BigECommerce: rolling window YTD",
     "querying BigECommerce: rolling window YTD without date range",
     "--------------------",
 
diff --git a/packages/cubejs-testing-drivers/fixtures/mssql.json b/packages/cubejs-testing-drivers/fixtures/mssql.json
@@ -141,6 +141,7 @@
     "---------------------------------------",
     "querying BigECommerce: rolling window by 2 day without date range",
     "querying BigECommerce: rolling window by 2 month without date range",
+    "querying BigECommerce: rolling window YTD",
     "querying BigECommerce: rolling window YTD without date range",
     "--------------------",
     "---------------------------------------",
diff --git a/packages/cubejs-testing-drivers/fixtures/mysql.json b/packages/cubejs-testing-drivers/fixtures/mysql.json
@@ -136,6 +136,7 @@
     "---------------------------------------",
     "querying BigECommerce: rolling window by 2 day without date range",
     "querying BigECommerce: rolling window by 2 month without date range",
+    "querying BigECommerce: rolling window YTD",
     "querying BigECommerce: rolling window YTD without date range",
 
     "---------------------------------------",
diff --git a/packages/cubejs-testing-drivers/fixtures/redshift.json b/packages/cubejs-testing-drivers/fixtures/redshift.json
@@ -172,6 +172,7 @@
     "---------------------------------------",
     "querying BigECommerce: rolling window by 2 day without date range",
     "querying BigECommerce: rolling window by 2 month without date range",
+    "querying BigECommerce: rolling window YTD",
     "querying BigECommerce: rolling window YTD without date range"
   ]
 }
diff --git a/packages/cubejs-testing-drivers/fixtures/snowflake.json b/packages/cubejs-testing-drivers/fixtures/snowflake.json
@@ -206,6 +206,7 @@
     "---------------------------------------",
     "querying BigECommerce: rolling window by 2 day without date range",
     "querying BigECommerce: rolling window by 2 month without date range",
+    "querying BigECommerce: rolling window YTD",
     "querying BigECommerce: rolling window YTD without date range"
   ]
 }
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/physical_plan_builder/builder.rs b/rust/cubesqlplanner/cubesqlplanner/src/physical_plan_builder/builder.rs
@@ -53,15 +53,15 @@ impl PhysicalPlanBuilderContext {
 
 pub struct PhysicalPlanBuilder {
     query_tools: Rc<QueryTools>,
-    plan_sql_templates: PlanSqlTemplates,
+    _plan_sql_templates: PlanSqlTemplates,
 }
 
 impl PhysicalPlanBuilder {
     pub fn new(query_tools: Rc<QueryTools>) -> Self {
         let plan_sql_templates = query_tools.plan_sql_templates();
         Self {
             query_tools,
-            plan_sql_templates,
+            _plan_sql_templates: plan_sql_templates,
         }
     }
 
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/base_measure.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/base_measure.rs
@@ -1,9 +1,7 @@
 use super::query_tools::QueryTools;
 use super::sql_evaluator::{MeasureTimeShift, MemberExpressionSymbol, MemberSymbol, SqlCall};
 use super::{evaluate_with_context, BaseMember, BaseMemberHelper, VisitorContext};
-use crate::cube_bridge::measure_definition::{
-    MeasureDefinition, RollingWindow, TimeShiftReference,
-};
+use crate::cube_bridge::measure_definition::{MeasureDefinition, RollingWindow};
 use crate::planner::sql_templates::PlanSqlTemplates;
 use cubenativeutils::CubeError;
 use std::fmt::{Debug, Formatter};
@@ -210,12 +208,6 @@ impl BaseMeasure {
         }
     }
 
-    pub fn time_shift_references(&self) -> Option<Vec<TimeShiftReference>> {
-        self.definition
-            .as_ref()
-            .map_or(None, |d| d.static_data().time_shift_references.clone())
-    }
-
     pub fn time_shifts(&self) -> Vec<MeasureTimeShift> {
         match self.member_evaluator.as_ref() {
             MemberSymbol::Measure(measure_symbol) => measure_symbol.time_shifts().clone(),
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/time_shift.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/sql_nodes/time_shift.rs
@@ -47,7 +47,9 @@ impl SqlNode for TimeShiftSqlNode {
             MemberSymbol::Dimension(ev) => {
                 if let Some(shift) = self.shifts.get(&ev.full_name()) {
                     let shift = shift.interval.to_sql();
-                    let res = templates.base_tools().add_timestamp_interval(input, shift)?;
+                    let res = templates
+                        .base_tools()
+                        .add_timestamp_interval(input, shift)?;
                     format!("({})", res)
                 } else {
                     input
diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/time_dimension/sql_interval.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/time_dimension/sql_interval.rs
@@ -61,25 +61,25 @@ impl SqlInterval {
     pub fn to_sql(&self) -> String {
         let mut res = vec![];
         if self.year != 0 {
-            res.push(format!("{} YEAR", self.year));
+            res.push(format!("{} year", self.year));
         }
         if self.month != 0 {
-            res.push(format!("{} MONTH", self.month));
+            res.push(format!("{} montH", self.month));
         }
         if self.week != 0 {
-            res.push(format!("{} WEEK", self.week));
+            res.push(format!("{} week", self.week));
         }
         if self.day != 0 {
-            res.push(format!("{} DAY", self.day));
+            res.push(format!("{} day", self.day));
         }
         if self.hour != 0 {
-            res.push(format!("{} HOUR", self.hour));
+            res.push(format!("{} hour", self.hour));
         }
         if self.minute != 0 {
-            res.push(format!("{} MINUTE", self.minute));
+            res.push(format!("{} minute", self.minute));
         }
         if self.second != 0 {
-            res.push(format!("{} SECOND", self.second));
+            res.push(format!("{} second", self.second));
         }
         res.join(" ")
     }

Original file line number	Diff line number	Diff line change
`@@ -172,6 +172,7 @@`
`172`	`172`	`"---------------------------------------",`
`173`	`173`	`"querying BigECommerce: rolling window by 2 day without date range",`
`174`	`174`	`"querying BigECommerce: rolling window by 2 month without date range",`
	`175`	`+ "querying BigECommerce: rolling window YTD",`
`175`	`176`	`"querying BigECommerce: rolling window YTD without date range"`
`176`	`177`	`]`
`177`	`178`	`}`
Original file line number	Diff line number	Diff line change
`@@ -206,6 +206,7 @@`
`206`	`206`	`"---------------------------------------",`
`207`	`207`	`"querying BigECommerce: rolling window by 2 day without date range",`
`208`	`208`	`"querying BigECommerce: rolling window by 2 month without date range",`
	`209`	`+ "querying BigECommerce: rolling window YTD",`
`209`	`210`	`"querying BigECommerce: rolling window YTD without date range"`
`210`	`211`	`]`
`211`	`212`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,15 +53,15 @@ impl PhysicalPlanBuilderContext {`
`53`	`53`
`54`	`54`	`pub struct PhysicalPlanBuilder {`
`55`	`55`	`query_tools: Rc<QueryTools>,`
`56`		`- plan_sql_templates: PlanSqlTemplates,`
	`56`	`+ _plan_sql_templates: PlanSqlTemplates,`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`impl PhysicalPlanBuilder {`
`60`	`60`	`pub fn new(query_tools: Rc<QueryTools>) -> Self {`
`61`	`61`	`let plan_sql_templates = query_tools.plan_sql_templates();`
`62`	`62`	`Self {`
`63`	`63`	`query_tools,`
`64`		`- plan_sql_templates,`
	`64`	`+ _plan_sql_templates: plan_sql_templates,`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`