move bigquery to timestamp

Author: waralexrom

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

@@ -42,14 +42,18 @@ export class BigqueryQuery extends BaseQuery {
   }
 
   public convertTz(field) {
-    return `DATETIME(${field}, '${this.timezone}')`;
+    return this.timeStampCast(`DATETIME(${field}, '${this.timezone}')`);
   }
 
   public timeStampCast(value) {
     return `TIMESTAMP(${value})`;
   }
 
   public dateTimeCast(value) {
+    return `TIMESTAMP(${value})`;
+  }
+
+  private dateTimeForceCast(value) {
     return `DATETIME(TIMESTAMP(${value}))`;
   }
 
@@ -58,7 +62,7 @@ export class BigqueryQuery extends BaseQuery {
   }
 
   public timeGroupedColumn(granularity, dimension) {
-    return `DATETIME_TRUNC(${dimension}, ${GRANULARITY_TO_INTERVAL[granularity]})`;
+    return this.timeStampCast(`DATETIME_TRUNC(${dimension}, ${GRANULARITY_TO_INTERVAL[granularity]})`);
   }
 
   /**
@@ -68,11 +72,11 @@ export class BigqueryQuery extends BaseQuery {
    */
   public dateBin(interval: string, source: string, origin: string): string {
     const [intervalFormatted, timeUnit] = this.formatInterval(interval);
-    const beginOfTime = this.dateTimeCast('\'1970-01-01T00:00:00\'');
+    const beginOfTime = this.dateTimeForceCast('\'1970-01-01T00:00:00\'');
 
-    return `(${this.dateTimeCast(`'${origin}'`)} + INTERVAL ${intervalFormatted} *
+    return `(${this.dateTimeForceCast(`'${origin}'`)} + INTERVAL ${intervalFormatted} *
       CAST(FLOOR(
-        DATETIME_DIFF(${source}, ${this.dateTimeCast(`'${origin}'`)}, ${timeUnit}) /
+        DATETIME_DIFF(${this.dateTimeForceCast(`${source}`)}, ${this.dateTimeForceCast(`'${origin}'`)}, ${timeUnit}) /
         DATETIME_DIFF(${beginOfTime} + INTERVAL ${intervalFormatted}, ${beginOfTime}, ${timeUnit})
       ) AS INT64))`;
   }
@@ -112,7 +116,7 @@ export class BigqueryQuery extends BaseQuery {
     } else if (intervalParsed.month && intervalParsed.day && intervalParsed.hour && intervalParsed.minute && intervalParsed.second && intKeys === 5) {
       return [`'${intervalParsed.month} ${intervalParsed.day} ${intervalParsed.hour}:${intervalParsed.minute}:${intervalParsed.second}' MONTH TO SECOND`, 'SECOND'];
     } else if (intervalParsed.week && intKeys === 1) {
-      return [`${intervalParsed.week} WEEK`, 'DAY'];
+      return [`${intervalParsed.week} WEEK`, 'WEEK'];
     } else if (intervalParsed.day && intKeys === 1) {
       return [`${intervalParsed.day} DAY`, 'DAY'];
     } else if (intervalParsed.day && intervalParsed.hour && intKeys === 2) {
@@ -150,7 +154,7 @@ export class BigqueryQuery extends BaseQuery {
     const values = timeDimension.timeSeries().map(
       ([from, to]) => `select '${from}' f, '${to}' t`
     ).join(' UNION ALL ');
-    return `SELECT ${this.dateTimeCast('dates.f')} date_from, ${this.dateTimeCast('dates.t')} date_to FROM (${values}) AS dates`;
+    return `SELECT ${this.timeStampCast('dates.f')} date_from, ${this.timeStampCast('dates.t')} date_to FROM (${values}) AS dates`;
   }
 
   public timestampFormat() {
@@ -182,16 +186,16 @@ export class BigqueryQuery extends BaseQuery {
   }
 
   public subtractInterval(date, interval) {
-    return `DATETIME_SUB(${date}, INTERVAL ${this.formatInterval(interval)[0]})`;
+    return this.subtractTimestampInterval(date, interval);
   }
 
   public addInterval(date, interval) {
-    return `DATETIME_ADD(${date}, INTERVAL ${this.formatInterval(interval)[0]})`;
+    return this.addTimestampInterval(date, interval);
   }
 
   public subtractTimestampInterval(date, interval) {
     const [intervalFormatted, timeUnit] = this.formatInterval(interval);
-    if (['YEAR', 'MONTH', 'QUARTER'].includes(timeUnit)) {
+    if (['YEAR', 'MONTH', 'QUARTER', 'WEEK'].includes(timeUnit)) {
       return this.timeStampCast(`DATETIME_SUB(DATETIME(${date}), INTERVAL ${intervalFormatted})`);
     }
 
@@ -200,7 +204,7 @@ export class BigqueryQuery extends BaseQuery {
 
   public addTimestampInterval(date, interval) {
     const [intervalFormatted, timeUnit] = this.formatInterval(interval);
-    if (['YEAR', 'MONTH', 'QUARTER'].includes(timeUnit)) {
+    if (['YEAR', 'MONTH', 'QUARTER', 'WEEK'].includes(timeUnit)) {
       return this.timeStampCast(`DATETIME_ADD(DATETIME(${date}), INTERVAL ${intervalFormatted})`);
     }
 
@@ -282,8 +286,8 @@ export class BigqueryQuery extends BaseQuery {
     '{% if not loop.last %} UNION ALL\n{% endif %}' +
     '{% endfor %}' +
     ') AS dates';
-    templates.statements.generated_time_series_select = 'SELECT DATETIME(d) AS date_from,\n' +
-    'DATETIME_SUB(DATETIME_ADD(DATETIME(d),  INTERVAL {{ granularity }}), INTERVAL 1 MILLISECOND) AS date_to \n' +
+    templates.statements.generated_time_series_select = 'SELECT TIMESTAMP(d) AS date_from,\n' +
+    'TIMESTAMP(DATETIME_SUB(DATETIME_ADD(DATETIME(d),  INTERVAL {{ granularity }}), INTERVAL 1 MILLISECOND)) AS date_to \n' +
     'FROM UNNEST(\n' +
     '{% if minimal_time_unit|upper in ["DAY", "WEEK", "MONTH", "QUARTER", "YEAR"] %}' +
     'GENERATE_DATE_ARRAY(DATE({{ start }}), DATE({{ end }}), INTERVAL {{ granularity }})\n' +
@@ -292,8 +296,8 @@ export class BigqueryQuery extends BaseQuery {
     '{% endif %}' +
     ') AS d';
 
-    templates.statements.generated_time_series_with_cte_range_source = 'SELECT DATETIME(d) AS date_from,\n' +
-    'DATETIME_SUB(DATETIME_ADD(DATETIME(d),  INTERVAL {{ granularity }}), INTERVAL 1 MILLISECOND) AS date_to \n' +
+    templates.statements.generated_time_series_with_cte_range_source = 'SELECT TIMESTAMP(d) AS date_from,\n' +
+    'TIMESTAMP(DATETIME_SUB(DATETIME_ADD(DATETIME(d),  INTERVAL {{ granularity }}), INTERVAL 1 MILLISECOND)) AS date_to \n' +
     'FROM {{ range_source }}, UNNEST(\n' +
     '{% if minimal_time_unit|upper in ["DAY", "WEEK", "MONTH", "QUARTER", "YEAR"] %}' +
     'GENERATE_DATE_ARRAY(DATE({{ range_source }}.{{ min_name }}), DATE({{ range_source }}.{{ max_name }}), INTERVAL {{ granularity }})\n' +