Skip to content

Commit a88f8e7

Browse files
waralexromwaralexrom
committed
in work
1 parent 1511c76 commit a88f8e7

File tree

12 files changed

+77
-35
lines changed

12 files changed

+77
-35
lines changed

‎packages/cubejs-testing-drivers/fixtures/athena.json‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,14 +140,19 @@
140140
"querying ECommerce: total quantity, avg discount, total sales, total profit by product + order + total -- rounding in athena",
141141
"querying ECommerce: total sales, total profit by month + order (date) + total -- doesn't work with the BigQuery",
142142
"querying ECommerce: total quantity, avg discount, total sales, total profit by product + order + total -- noisy test",
143-
"querying BigECommerce: rolling window by 2 day without date range -- requires tesseract",
144-
"querying BigECommerce: rolling window by 2 month without date range -- requires tesseract",
145-
"querying BigECommerce: rolling window YTD without date range -- requires tesseract",
146143
"querying BigECommerce: partitioned pre-agg",
147144
"querying BigECommerce: null sum",
148145
"querying BigECommerce: null boolean",
149146
"--------------------",
150147

148+
"---------------------------------------",
149+
"Requires Tesseract. ",
150+
"---------------------------------------",
151+
"querying BigECommerce: rolling window by 2 day without date range",
152+
"querying BigECommerce: rolling window by 2 month without date range",
153+
"querying BigECommerce: rolling window YTD without date range",
154+
"--------------------",
155+
151156
"week granularity is not supported for intervals",
152157
"--------------------",
153158
"querying BigECommerce: rolling window by 2 week",

‎packages/cubejs-testing-drivers/fixtures/bigquery.json‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,17 @@
154154
"querying ECommerce: total quantity, avg discount, total sales, total profit by product + order + total -- rounding in athena",
155155
"querying ECommerce: total sales, total profit by month + order (date) + total -- doesn't work with the BigQuery",
156156
"querying ECommerce: total quantity, avg discount, total sales, total profit by product + order + total -- noisy test",
157-
"querying BigECommerce: rolling window by 2 day without date range -- requires tesseract",
158-
"querying BigECommerce: rolling window by 2 month without date range -- requires tesseract",
159-
"querying BigECommerce: rolling window YTD without date range -- requires tesseract",
160157
"querying BigECommerce: null sum",
161158
"querying BigECommerce: null boolean",
162159

160+
"---------------------------------------",
161+
"Requires Tesseract. ",
162+
"---------------------------------------",
163+
"querying BigECommerce: rolling window by 2 day without date range",
164+
"querying BigECommerce: rolling window by 2 month without date range",
165+
"querying BigECommerce: rolling window YTD without date range",
166+
"--------------------",
167+
163168
"SKIPPED SQL API (Need work)",
164169
"---------------------------------------",
165170
"SQL API: reuse params",

‎packages/cubejs-testing-drivers/fixtures/clickhouse.json‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,6 @@
163163
"querying ECommerce: total quantity, avg discount, total sales, total profit by product + order + total -- rounding in athena",
164164
"querying ECommerce: total sales, total profit by month + order (date) + total -- doesn't work with the BigQuery",
165165
"querying ECommerce: total quantity, avg discount, total sales, total profit by product + order + total -- noisy test",
166-
"querying BigECommerce: rolling window by 2 day without date range -- requires tesseract",
167-
"querying BigECommerce: rolling window by 2 month without date range -- requires tesseract",
168-
"querying BigECommerce: rolling window YTD without date range -- requires tesseract",
169166
"querying ECommerce: partitioned pre-agg",
170167
"querying ECommerce: partitioned pre-agg higher granularity",
171168
"querying BigECommerce: partitioned pre-agg",
@@ -177,6 +174,14 @@
177174
"querying BigECommerce: rolling window by 2 week",
178175
"querying BigECommerce: rolling window by 2 month",
179176

177+
"---------------------------------------",
178+
"Requires Tesseract. ",
179+
"---------------------------------------",
180+
"querying BigECommerce: rolling window by 2 day without date range",
181+
"querying BigECommerce: rolling window by 2 month without date range",
182+
"querying BigECommerce: rolling window YTD without date range",
183+
"--------------------",
184+
180185
"---------------------------------------",
181186
"Custom Granularities ",
182187
"---------------------------------------",

‎packages/cubejs-testing-drivers/fixtures/databricks-jdbc.json‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,14 @@
205205
"querying ECommerce: total quantity, avg discount, total sales, total profit by product + order + total -- rounding in athena",
206206
"querying ECommerce: total sales, total profit by month + order (date) + total -- doesn't work with the BigQuery",
207207
"querying ECommerce: total quantity, avg discount, total sales, total profit by product + order + total -- noisy test",
208-
"querying BigECommerce: rolling window by 2 day without date range -- requires tesseract",
209-
"querying BigECommerce: rolling window by 2 month without date range -- requires tesseract",
210-
"querying BigECommerce: rolling window YTD without date range -- requires tesseract",
208+
209+
"---------------------------------------",
210+
"Requires Tesseract. ",
211+
"---------------------------------------",
212+
"querying BigECommerce: rolling window by 2 day without date range",
213+
"querying BigECommerce: rolling window by 2 month without date range",
214+
"querying BigECommerce: rolling window YTD without date range",
215+
"--------------------",
211216

212217
"---------------------------------------",
213218
"Custom Granularities ",

‎packages/cubejs-testing-drivers/fixtures/mssql.json‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,14 @@
135135
"querying ECommerce: total quantity, avg discount, total sales, total profit by product + order + total -- noisy test",
136136
"querying BigECommerce: null sum",
137137
"querying BigECommerce: null boolean",
138-
"querying BigECommerce: rolling window by 2 day without date range -- requires tesseract",
139-
"querying BigECommerce: rolling window by 2 month without date range -- requires tesseract",
140-
"querying BigECommerce: rolling window YTD without date range -- requires tesseract",
141138

139+
"---------------------------------------",
140+
"Requires Tesseract. ",
141+
"---------------------------------------",
142+
"querying BigECommerce: rolling window by 2 day without date range",
143+
"querying BigECommerce: rolling window by 2 month without date range",
144+
"querying BigECommerce: rolling window YTD without date range",
145+
"--------------------",
142146
"---------------------------------------",
143147
"SKIPPED SQL API (Need work)",
144148
"---------------------------------------",

‎packages/cubejs-testing-drivers/fixtures/mysql.json‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,12 @@
131131
"querying BigECommerce: partitioned pre-agg",
132132
"querying BigECommerce: null sum",
133133
"querying BigECommerce: null boolean",
134-
"querying BigECommerce: rolling window by 2 day without date range -- requires tesseract",
135-
"querying BigECommerce: rolling window by 2 month without date range -- requires tesseract",
136-
"querying BigECommerce: rolling window YTD without date range -- requires tesseract",
134+
"---------------------------------------",
135+
"Requires Tesseract. ",
136+
"---------------------------------------",
137+
"querying BigECommerce: rolling window by 2 day without date range",
138+
"querying BigECommerce: rolling window by 2 month without date range",
139+
"querying BigECommerce: rolling window YTD without date range",
137140

138141
"---------------------------------------",
139142
"Custom Granularities ",

‎packages/cubejs-testing-drivers/fixtures/postgres.json‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,11 @@
156156
"querying Products: dimensions -- doesn't work wo ordering",
157157
"querying ECommerce: total quantity, avg discount, total sales, total profit by product + order + total -- rounding in athena",
158158
"querying ECommerce: total quantity, avg discount, total sales, total profit by product + order + total -- noisy test",
159-
"querying BigECommerce: rolling window by 2 day without date range -- requires tesseract",
160-
"querying BigECommerce: rolling window by 2 month without date range -- requires tesseract",
161-
"querying BigECommerce: rolling window YTD without date range -- requires tesseract"
159+
"---------------------------------------",
160+
"Requires Tesseract. ",
161+
"---------------------------------------",
162+
"querying BigECommerce: rolling window by 2 day without date range",
163+
"querying BigECommerce: rolling window by 2 month without date range",
164+
"querying BigECommerce: rolling window YTD without date range"
162165
]
163166
}

‎packages/cubejs-testing-drivers/fixtures/redshift.json‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,11 @@
167167
"querying Products: dimensions -- doesn't work wo ordering",
168168
"querying ECommerce: total quantity, avg discount, total sales, total profit by product + order + total -- rounding in athena",
169169
"querying ECommerce: total quantity, avg discount, total sales, total profit by product + order + total -- noisy test",
170-
"querying BigECommerce: rolling window by 2 day without date range -- requires tesseract",
171-
"querying BigECommerce: rolling window by 2 month without date range -- requires tesseract",
172-
"querying BigECommerce: rolling window YTD without date range -- requires tesseract"
170+
"---------------------------------------",
171+
"Requires Tesseract. ",
172+
"---------------------------------------",
173+
"querying BigECommerce: rolling window by 2 day without date range",
174+
"querying BigECommerce: rolling window by 2 month without date range",
175+
"querying BigECommerce: rolling window YTD without date range"
173176
]
174177
}

‎packages/cubejs-testing-drivers/fixtures/snowflake.json‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,11 @@
201201
"querying ECommerce: total quantity, avg discount, total sales, total profit by product + order + total -- noisy test",
202202
"querying BigECommerce: null sum",
203203
"querying BigECommerce: null boolean",
204-
"querying BigECommerce: rolling window by 2 day without date range -- requires tesseract",
205-
"querying BigECommerce: rolling window by 2 month without date range -- requires tesseract",
206-
"querying BigECommerce: rolling window YTD without date range -- requires tesseract"
204+
"---------------------------------------",
205+
"Requires Tesseract. ",
206+
"---------------------------------------",
207+
"querying BigECommerce: rolling window by 2 day without date range",
208+
"querying BigECommerce: rolling window by 2 month without date range",
209+
"querying BigECommerce: rolling window YTD without date range"
207210
]
208211
}

‎rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/base_tools.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ pub trait BaseTools {
5151
fn get_allocated_params(&self) -> Result<Vec<String>, CubeError>;
5252
fn subtract_interval(&self, date: String, interval: String) -> Result<String, CubeError>;
5353
fn add_interval(&self, date: String, interval: String) -> Result<String, CubeError>;
54+
fn add_timestamp_interval(&self, date: String, interval: String) -> Result<String, CubeError>;
5455
fn all_cube_members(&self, path: String) -> Result<Vec<String>, CubeError>;
5556
fn interval_and_minimal_time_unit(&self, interval: String) -> Result<Vec<String>, CubeError>;
5657
//===== TODO Move to templates

0 commit comments

Comments
 (0)