move diffTimeUnitForInterval to BaseQuery

cube-js · Sep 12, 2024 · 6467a90 · 6467a90
1 parent bcdd4d5
commit 6467a90
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 80 deletions.
diff --git a/packages/cubejs-duckdb-driver/src/DuckDBQuery.ts b/packages/cubejs-duckdb-driver/src/DuckDBQuery.ts
@@ -48,26 +48,6 @@ export class DuckDBQuery extends BaseQuery {
       )::int`;
   }
 
-  private diffTimeUnitForInterval(interval: string): string {
-    if (/second/i.test(interval)) {
-      return 'second';
-    } else if (/minute/i.test(interval)) {
-      return 'minute';
-    } else if (/hour/i.test(interval)) {
-      return 'hour';
-    } else if (/day/i.test(interval)) {
-      return 'day';
-    } else if (/week/i.test(interval)) {
-      return 'day';
-    } else if (/month/i.test(interval)) {
-      return 'month';
-    } else if (/quarter/i.test(interval)) {
-      return 'month';
-    } else /* if (/year/i.test(interval)) */ {
-      return 'year';
-    }
-  }
-
   public countDistinctApprox(sql: string) {
     return `approx_count_distinct(${sql})`;
   }

diff --git a/packages/cubejs-schema-compiler/src/adapter/BaseQuery.js b/packages/cubejs-schema-compiler/src/adapter/BaseQuery.js
@@ -2756,6 +2756,32 @@ export class BaseQuery {
     // Different syntax possible in different DBs
   }
 
+  /**
+   * Returns the lowest time unit for the interval
+   * @protected
+   * @param {string} interval
+   * @returns {string}
+   */
+  diffTimeUnitForInterval(interval) {
+    if (/second/i.test(interval)) {
+      return 'second';
+    } else if (/minute/i.test(interval)) {
+      return 'minute';
+    } else if (/hour/i.test(interval)) {
+      return 'hour';
+    } else if (/day/i.test(interval)) {
+      return 'day';
+    } else if (/week/i.test(interval)) {
+      return 'day';
+    } else if (/month/i.test(interval)) {
+      return 'month';
+    } else if (/quarter/i.test(interval)) {
+      return 'month';
+    } else /* if (/year/i.test(interval)) */ {
+      return 'year';
+    }
+  }
+
   /**
    * @param {string} dimension
    * @param {import('./Granularity').Granularity} granularity

diff --git a/packages/cubejs-schema-compiler/src/adapter/ClickHouseQuery.ts b/packages/cubejs-schema-compiler/src/adapter/ClickHouseQuery.ts
@@ -80,26 +80,6 @@ export class ClickHouseQuery extends BaseQuery {
     )`;
   }
 
-  private diffTimeUnitForInterval(interval: string): string {
-    if (/second/i.test(interval)) {
-      return 'second';
-    } else if (/minute/i.test(interval)) {
-      return 'minute';
-    } else if (/hour/i.test(interval)) {
-      return 'hour';
-    } else if (/day/i.test(interval)) {
-      return 'day';
-    } else if (/week/i.test(interval)) {
-      return 'day';
-    } else if (/month/i.test(interval)) {
-      return 'month';
-    } else if (/quarter/i.test(interval)) {
-      return 'month';
-    } else /* if (/year/i.test(interval)) */ {
-      return 'year';
-    }
-  }
-
   public subtractInterval(date: string, interval: string): string {
     return `subDate(${date}, ${this.formatInterval(interval)})`;
   }

diff --git a/packages/cubejs-schema-compiler/src/adapter/MssqlQuery.ts b/packages/cubejs-schema-compiler/src/adapter/MssqlQuery.ts
@@ -101,26 +101,6 @@ export class MssqlQuery extends BaseQuery {
     )`;
   }
 
-  private diffTimeUnitForInterval(interval: string): string {
-    if (/second/i.test(interval)) {
-      return 'second';
-    } else if (/minute/i.test(interval)) {
-      return 'minute';
-    } else if (/hour/i.test(interval)) {
-      return 'hour';
-    } else if (/day/i.test(interval)) {
-      return 'day';
-    } else if (/week/i.test(interval)) {
-      return 'day';
-    } else if (/month/i.test(interval)) {
-      return 'month';
-    } else if (/quarter/i.test(interval)) {
-      return 'month';
-    } else /* if (/year/i.test(interval)) */ {
-      return 'year';
-    }
-  }
-
   public newParamAllocator(expressionParams) {
     return new MssqlParamAllocator(expressionParams);
   }

diff --git a/packages/cubejs-schema-compiler/src/adapter/SnowflakeQuery.ts b/packages/cubejs-schema-compiler/src/adapter/SnowflakeQuery.ts
@@ -72,26 +72,6 @@ export class SnowflakeQuery extends BaseQuery {
     }).join(' ');
   }
 
-  private diffTimeUnitForInterval(interval: string): string {
-    if (/second/i.test(interval)) {
-      return 'second';
-    } else if (/minute/i.test(interval)) {
-      return 'minute';
-    } else if (/hour/i.test(interval)) {
-      return 'hour';
-    } else if (/day/i.test(interval)) {
-      return 'day';
-    } else if (/week/i.test(interval)) {
-      return 'day';
-    } else if (/month/i.test(interval)) {
-      return 'month';
-    } else if (/quarter/i.test(interval)) {
-      return 'month';
-    } else /* if (/year/i.test(interval)) */ {
-      return 'year';
-    }
-  }
-
   public timeStampCast(value) {
     return `${value}::timestamp_tz`;
   }