feat(schema-compiler): Support custom granularities with Year-Month intervals for AWS Redshift dialect

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

@@ -1,3 +1,4 @@
+import { parseSqlInterval } from '@cubejs-backend/shared';
 import { PostgresQuery } from './PostgresQuery';
 
 export class RedshiftQuery extends PostgresQuery {
@@ -12,6 +13,74 @@
     return 'GETDATE()';
   }
 
+  /**
+   * Redshift doesn't support Interval values with month or year parts (as Postgres does)
+   * so we need to make date math on our own.
+   */
+  public override subtractInterval(date: string, interval: string): string {
+    const intervalParsed = parseSqlInterval(interval);
+    let result = date;
+
+    for (const [datePart, intervalValue] of Object.entries(intervalParsed)) {
+      result = `DATEADD(${datePart}, -${intervalValue}, ${result})`;
+    }
+
+    return result;
+  }
+
+  /**
+   * Redshift doesn't support Interval values with month or year parts (as Postgres does)
+   * so we need to make date math on our own.
+   */
+  public override addInterval(date: string, interval: string): string {
+    const intervalParsed = parseSqlInterval(interval);
+    let result = date;
+
+    for (const [datePart, intervalValue] of Object.entries(intervalParsed)) {
+      result = `DATEADD(${datePart}, ${intervalValue}, ${result})`;
+    }
+
+    return result;
+  }
+
+  /**
+   * Redshift doesn't support Interval values with month or year parts (as Postgres does)
+   * so we need to make date math on our own.
+   */
+  public override dateBin(interval: string, source: string, origin: string): string {
+    const intervalParsed = parseSqlInterval(interval);
+
+    if ((intervalParsed.year || intervalParsed.month || intervalParsed.quarter) &&
+        (intervalParsed.week || intervalParsed.day || intervalParsed.hour || intervalParsed.minute || intervalParsed.second)) {
+      throw new Error(`Complex intervals like "${interval}" are not supported. Please use Year to Month or Day to second intervals`);
+    }
+
+    if (intervalParsed.year || intervalParsed.month || intervalParsed.quarter) {
+      let totalMonths = 0;
+
+      if (intervalParsed.year) {
+        totalMonths += intervalParsed.year * 12;
+      }
+
+      if (intervalParsed.quarter) {
+        totalMonths += intervalParsed.quarter * 3;
+      }
+
+      if (intervalParsed.month) {
+        totalMonths += intervalParsed.month;
+      }
+
+      return `DATEADD(
+      month,
+      (FLOOR(DATEDIFF(month, ${this.dateTimeCast(`'${origin}'`)}, ${source}) / ${totalMonths}) * ${totalMonths})::int,
+      ${this.dateTimeCast(`'${origin}'`)}
+    )`;
+    }
+
+    // For days and lower intervals - we can reuse Postgres version
+    return super.dateBin(interval, source, origin);
+  }
+
   public sqlTemplates() {
     const templates = super.sqlTemplates();
     templates.functions.DLOG10 = 'LOG(10, {{ args_concat }})';

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

@@ -155,17 +155,10 @@
   },
   "skip": [
     "---------------------------------------",
-    "Error: Interval values with month or year parts are not supported",
+    "Error: Complex intervals like \"3 months 2 weeks 3 days\" are not supported. @see dateBin impl in ReshiftQuery",
     "---------------------------------------",
-    "querying BigECommerce: rolling window by 2 month",
-    "querying custom granularities ECommerce: count by half_year + no dimension",
-    "querying custom granularities ECommerce: count by half_year_by_1st_april + no dimension",
     "querying custom granularities ECommerce: count by three_months_by_march + no dimension",
-    "querying custom granularities ECommerce: count by half_year + dimension",
-    "querying custom granularities ECommerce: count by half_year_by_1st_april + dimension",
     "querying custom granularities ECommerce: count by three_months_by_march + dimension",
-    "querying custom granularities ECommerce: count by two_mo_by_feb + no dimension + rollingCountByTrailing",
-    "querying custom granularities ECommerce: count by two_mo_by_feb + no dimension + rollingCountByLeading",
 
     "---------------------------------------",
     "SKIPPED FOR ALL                        ",