@cubejs-backend/schema-compiler 1.3.23 → 1.3.25

package/dist/src/adapter/BigqueryQuery.d.ts

@@ -29,10 +29,30 @@ export declare class BigqueryQuery extends BaseQuery {
     overTimeSeriesSelect(cumulativeMeasures: any, dateSeriesSql: any, baseQuery: any, dateJoinConditionSql: any, baseQueryAlias: any): string;
     subtractInterval(date: any, interval: any): string;
     addInterval(date: any, interval: any): string;
-    subtractTimestampInterval(date: any, interval: any): string;
-    addTimestampInterval(date: any, interval: any): string;
+    subtractTimestampInterval(timestamp: any, interval: any): string;
+    intervalString(interval: string): string;
+    addTimestampInterval(timestamp: any, interval: any): string;
     nowTimestampSql(): string;
     unixTimestampSql(): string;
+    /**
+     * Should be protected, but BaseQuery is in js
+     * Overridden from BaseQuery to support BigQuery strict data types for
+     * joining conditions (note timeStampCast)
+     */
+    runningTotalDateJoinCondition(): (BaseTimeDimension | ((_dateFrom: string, dateTo: string, dateField: string, dimensionDateFrom: string, _dimensionDateTo: string) => string))[][];
+    /**
+     * Should be protected, but BaseQuery is in js
+     * Overridden from BaseQuery to support BigQuery strict data types for
+     * joining conditions (note timeStampCast)
+     */
+    rollingWindowToDateJoinCondition(granularity: any): (BaseTimeDimension | ((dateFrom: string, dateTo: string, dateField: string, _dimensionDateFrom: string, _dimensionDateTo: string, _isFromStartToEnd: boolean) => string))[][];
+    /**
+     * Should be protected, but BaseQuery is in js
+     * Overridden from BaseQuery to support BigQuery strict data types for
+     * joining conditions (note timeStampCast)
+     */
+    rollingWindowDateJoinCondition(trailingInterval: any, leadingInterval: any, offset: any): (BaseTimeDimension | ((dateFrom: string, dateTo: string, dateField: string, _dimensionDateFrom: string, _dimensionDateTo: string, isFromStartToEnd: boolean) => string))[][];
+    dateFromStartToEndConditionSql(dateJoinCondition: any, fromRollup: any, isFromStartToEnd: any): any;
     preAggregationLoadSql(cube: any, preAggregation: any, tableName: any): any;
     hllInit(sql: any): string;
     hllMerge(sql: any): string;

package/dist/src/adapter/BigqueryQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BigqueryQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/BigqueryQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAmCxD,qBAAa,aAAc,SAAQ,SAAS;IACnC,YAAY,CAAC,GAAG,KAAA;IAIhB,SAAS,CAAC,KAAK,KAAA;IAIf,aAAa,CAAC,KAAK,KAAA;IAInB,YAAY,CAAC,KAAK,KAAA;IAIlB,gBAAgB,CAAC,IAAI,KAAA;IAIrB,iBAAiB,CAAC,WAAW,KAAA,EAAE,SAAS,KAAA;IAI/C;;;;OAIG;IACI,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAWxE;;;;;OAKG;IACH,OAAO,CAAC,cAAc;IAmDN,0BAA0B,CAAC,QAAQ,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAIvE,SAAS,CAAC,MAAM,KAAA;IAIhB,aAAa,CAAC,aAAa,EAAE,iBAAiB;IAI9C,SAAS,CAAC,aAAa,EAAE,iBAAiB;IAO1C,eAAe;IAIf,kBAAkB,IAAI,MAAM;IAI5B,oBAAoB,CAAC,kBAAkB,KAAA,EAAE,aAAa,KAAA,EAAE,SAAS,KAAA,EAAE,oBAAoB,KAAA,EAAE,cAAc,KAAA;IAoBvG,gBAAgB,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAI/B,WAAW,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAI1B,yBAAyB,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IASxC,oBAAoB,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IASnC,eAAe;IAIf,gBAAgB;IAKhB,qBAAqB,CAAC,IAAI,KAAA,EAAE,cAAc,KAAA,EAAE,SAAS,KAAA;IAIrD,OAAO,CAAC,GAAG,KAAA;IAIX,QAAQ,CAAC,GAAG,KAAA;IAIZ,mBAAmB,CAAC,GAAG,KAAA;IAIvB,gBAAgB,CAAC,OAAO,KAAA;IAIxB,iCAAiC;IAIjC,sBAAsB;;;IAMtB,YAAY;CA0DpB"}
+{"version":3,"file":"BigqueryQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/BigqueryQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAmCxD,qBAAa,aAAc,SAAQ,SAAS;IACnC,YAAY,CAAC,GAAG,KAAA;IAIhB,SAAS,CAAC,KAAK,KAAA;IAIf,aAAa,CAAC,KAAK,KAAA;IAInB,YAAY,CAAC,KAAK,KAAA;IAIlB,gBAAgB,CAAC,IAAI,KAAA;IAIrB,iBAAiB,CAAC,WAAW,KAAA,EAAE,SAAS,KAAA;IAI/C;;;;OAIG;IACI,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAWxE;;;;;OAKG;IACH,OAAO,CAAC,cAAc;IAmDN,0BAA0B,CAAC,QAAQ,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAIvE,SAAS,CAAC,MAAM,KAAA;IAIhB,aAAa,CAAC,aAAa,EAAE,iBAAiB;IAI9C,SAAS,CAAC,aAAa,EAAE,iBAAiB;IAO1C,eAAe;IAIf,kBAAkB,IAAI,MAAM;IAI5B,oBAAoB,CAAC,kBAAkB,KAAA,EAAE,aAAa,KAAA,EAAE,SAAS,KAAA,EAAE,oBAAoB,KAAA,EAAE,cAAc,KAAA;IAoBvG,gBAAgB,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAS/B,WAAW,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAS1B,yBAAyB,CAAC,SAAS,KAAA,EAAE,QAAQ,KAAA;IAI7C,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAIxC,oBAAoB,CAAC,SAAS,KAAA,EAAE,QAAQ,KAAA;IAIxC,eAAe;IAIf,gBAAgB;IAIvB;;;;OAIG;IACa,6BAA6B,sCAKzB,MAAM,UAAU,MAAM,aAAa,MAAM,qBAAqB,MAAM,oBAAoB,MAAM;IAKlH;;;;OAIG;IACa,gCAAgC,CAAC,WAAW,KAAA,oCAMzC,MAAM,UAAU,MAAM,aAAa,MAAM,sBAAsB,MAAM,oBAAoB,MAAM,qBAAqB,OAAO;IAK9I;;;;OAIG;IACa,8BAA8B,CAAC,gBAAgB,KAAA,EAAE,eAAe,KAAA,EAAE,MAAM,KAAA,oCAK9D,MAAM,UAAU,MAAM,aAAa,MAAM,sBAAsB,MAAM,oBAAoB,MAAM,oBAAoB,OAAO;IAqBpI,8BAA8B,CAAC,iBAAiB,KAAA,EAAE,UAAU,KAAA,EAAE,gBAAgB,KAAA;IAuBvF,qBAAqB,CAAC,IAAI,KAAA,EAAE,cAAc,KAAA,EAAE,SAAS,KAAA;IAIrD,OAAO,CAAC,GAAG,KAAA;IAIX,QAAQ,CAAC,GAAG,KAAA;IAIZ,mBAAmB,CAAC,GAAG,KAAA;IAIvB,gBAAgB,CAAC,OAAO,KAAA;IAIxB,iCAAiC;IAIjC,sBAAsB;;;IAMtB,YAAY;CA4DpB"}

package/dist/src/adapter/BigqueryQuery.js

@@ -39,7 +39,7 @@ class BigqueryQuery extends BaseQuery_1.BaseQuery {
         return `CAST(${sql} as STRING)`;
     }
     convertTz(field) {
-        return `DATETIME(${this.timeStampCast(field)}, '${this.timezone}')`;
+        return `TIMESTAMP(DATETIME(${field}), '${this.timezone}')`;
     }
     timeStampCast(value) {
         return `TIMESTAMP(${value})`;
@@ -51,7 +51,7 @@ class BigqueryQuery extends BaseQuery_1.BaseQuery {
         return `\`${name}\``;
     }
     timeGroupedColumn(granularity, dimension) {
-        return `DATETIME_TRUNC(${dimension}, ${GRANULARITY_TO_INTERVAL[granularity]})`;
+        return this.timeStampCast(`DATETIME_TRUNC(${dimension}, ${GRANULARITY_TO_INTERVAL[granularity]})`);
     }
     /**
      * Returns sql for source expression floored to timestamps aligned with
@@ -63,7 +63,7 @@ class BigqueryQuery extends BaseQuery_1.BaseQuery {
         const beginOfTime = this.dateTimeCast('\'1970-01-01T00:00:00\'');
         return `(${this.dateTimeCast(`'${origin}'`)} + INTERVAL ${intervalFormatted} *
       CAST(FLOOR(
-        DATETIME_DIFF(${source}, ${this.dateTimeCast(`'${origin}'`)}, ${timeUnit}) /
+        DATETIME_DIFF(${this.dateTimeCast(source)}, ${this.dateTimeCast(`'${origin}'`)}, ${timeUnit}) /
         DATETIME_DIFF(${beginOfTime} + INTERVAL ${intervalFormatted}, ${beginOfTime}, ${timeUnit})
       ) AS INT64))`;
     }
@@ -176,31 +176,99 @@ class BigqueryQuery extends BaseQuery_1.BaseQuery {
     `;
     }
     subtractInterval(date, interval) {
-        return `DATETIME_SUB(${date}, INTERVAL ${this.formatInterval(interval)[0]})`;
-    }
-    addInterval(date, interval) {
-        return `DATETIME_ADD(${date}, INTERVAL ${this.formatInterval(interval)[0]})`;
-    }
-    subtractTimestampInterval(date, interval) {
         const [intervalFormatted, timeUnit] = this.formatInterval(interval);
-        if (['YEAR', 'MONTH', 'QUARTER'].includes(timeUnit)) {
+        if (['YEAR', 'MONTH', 'QUARTER'].includes(timeUnit) || intervalFormatted.includes('WEEK')) {
             return this.timeStampCast(`DATETIME_SUB(DATETIME(${date}), INTERVAL ${intervalFormatted})`);
         }
         return `TIMESTAMP_SUB(${date}, INTERVAL ${intervalFormatted})`;
     }
-    addTimestampInterval(date, interval) {
+    addInterval(date, interval) {
         const [intervalFormatted, timeUnit] = this.formatInterval(interval);
-        if (['YEAR', 'MONTH', 'QUARTER'].includes(timeUnit)) {
+        if (['YEAR', 'MONTH', 'QUARTER'].includes(timeUnit) || intervalFormatted.includes('WEEK')) {
             return this.timeStampCast(`DATETIME_ADD(DATETIME(${date}), INTERVAL ${intervalFormatted})`);
         }
         return `TIMESTAMP_ADD(${date}, INTERVAL ${intervalFormatted})`;
     }
+    subtractTimestampInterval(timestamp, interval) {
+        return this.subtractInterval(timestamp, interval);
+    }
+    intervalString(interval) {
+        return `${interval}`;
+    }
+    addTimestampInterval(timestamp, interval) {
+        return this.addInterval(timestamp, interval);
+    }
     nowTimestampSql() {
         return 'CURRENT_TIMESTAMP()';
     }
     unixTimestampSql() {
         return `UNIX_SECONDS(${this.nowTimestampSql()})`;
     }
+    /**
+     * Should be protected, but BaseQuery is in js
+     * Overridden from BaseQuery to support BigQuery strict data types for
+     * joining conditions (note timeStampCast)
+     */
+    runningTotalDateJoinCondition() {
+        return this.timeDimensions
+            .map(d => [
+            d,
+            (_dateFrom, dateTo, dateField, dimensionDateFrom, _dimensionDateTo) => `${dateField} >= ${dimensionDateFrom} AND ${dateField} <= ${this.timeStampCast(dateTo)}`
+        ]);
+    }
+    /**
+     * Should be protected, but BaseQuery is in js
+     * Overridden from BaseQuery to support BigQuery strict data types for
+     * joining conditions (note timeStampCast)
+     */
+    rollingWindowToDateJoinCondition(granularity) {
+        return this.timeDimensions
+            .filter(td => td.granularity)
+            .map(d => [
+            d,
+            (dateFrom, dateTo, dateField, _dimensionDateFrom, _dimensionDateTo, _isFromStartToEnd) => `${dateField} >= ${this.timeGroupedColumn(granularity, dateFrom)} AND ${dateField} <= ${this.timeStampCast(dateTo)}`
+        ]);
+    }
+    /**
+     * Should be protected, but BaseQuery is in js
+     * Overridden from BaseQuery to support BigQuery strict data types for
+     * joining conditions (note timeStampCast)
+     */
+    rollingWindowDateJoinCondition(trailingInterval, leadingInterval, offset) {
+        offset = offset || 'end';
+        return this.timeDimensions
+            .filter(td => td.granularity)
+            .map(d => [d, (dateFrom, dateTo, dateField, _dimensionDateFrom, _dimensionDateTo, isFromStartToEnd) => {
+                // dateFrom based window
+                const conditions = [];
+                if (trailingInterval !== 'unbounded') {
+                    const startDate = isFromStartToEnd || offset === 'start' ? dateFrom : dateTo;
+                    const trailingStart = trailingInterval ? this.subtractInterval(startDate, trailingInterval) : startDate;
+                    const sign = offset === 'start' ? '>=' : '>';
+                    conditions.push(`${dateField} ${sign} ${this.timeStampCast(trailingStart)}`);
+                }
+                if (leadingInterval !== 'unbounded') {
+                    const endDate = isFromStartToEnd || offset === 'end' ? dateTo : dateFrom;
+                    const leadingEnd = leadingInterval ? this.addInterval(endDate, leadingInterval) : endDate;
+                    const sign = offset === 'end' ? '<=' : '<';
+                    conditions.push(`${dateField} ${sign} ${this.timeStampCast(leadingEnd)}`);
+                }
+                return conditions.length ? conditions.join(' AND ') : '1 = 1';
+            }]);
+    }
+    // Should be protected, but BaseQuery is in js
+    dateFromStartToEndConditionSql(dateJoinCondition, fromRollup, isFromStartToEnd) {
+        return dateJoinCondition.map(([d, f]) => ({
+            filterToWhere: () => {
+                const timeSeries = d.timeSeries();
+                return f(isFromStartToEnd ?
+                    this.timeStampCast(this.paramAllocator.allocateParam(timeSeries[0][0])) :
+                    `${this.timeStampInClientTz(d.dateFromParam())}`, isFromStartToEnd ?
+                    this.timeStampCast(this.paramAllocator.allocateParam(timeSeries[timeSeries.length - 1][1])) :
+                    `${this.timeStampInClientTz(d.dateToParam())}`, `${fromRollup ? this.dimensionSql(d) : d.convertedToTz()}`, `${this.timeStampInClientTz(d.dateFromParam())}`, `${this.timeStampInClientTz(d.dateToParam())}`, isFromStartToEnd);
+            }
+        }));
+    }
     // eslint-disable-next-line no-unused-vars
     preAggregationLoadSql(cube, preAggregation, tableName) {
         return this.preAggregationSql(cube, preAggregation);
@@ -229,7 +297,7 @@ class BigqueryQuery extends BaseQuery_1.BaseQuery {
         const templates = super.sqlTemplates();
         templates.quotes.identifiers = '`';
         templates.quotes.escape = '\\`';
-        templates.functions.DATETRUNC = 'DATETIME_TRUNC(CAST({{ args[1] }} AS DATETIME), {% if date_part|upper == \'WEEK\' %}{{ \'WEEK(MONDAY)\' }}{% else %}{{ date_part }}{% endif %})';
+        templates.functions.DATETRUNC = 'TIMESTAMP(DATETIME_TRUNC(CAST({{ args[1] }} AS DATETIME), {% if date_part|upper == \'WEEK\' %}{{ \'WEEK(MONDAY)\' }}{% else %}{{ date_part }}{% endif %}))';
         templates.functions.LOG = 'LOG({{ args_concat }}{% if args[1] is undefined %}, 10{% endif %})';
         templates.functions.BTRIM = 'TRIM({{ args_concat }})';
         templates.functions.STRPOS = 'STRPOS({{ args_concat }})';
@@ -242,11 +310,13 @@ class BigqueryQuery extends BaseQuery_1.BaseQuery {
         templates.expressions.binary = '{% if op == \'%\' %}MOD({{ left }}, {{ right }}){% else %}({{ left }} {{ op }} {{ right }}){% endif %}';
         templates.expressions.interval = 'INTERVAL {{ interval }}';
         templates.expressions.extract = 'EXTRACT({% if date_part == \'DOW\' %}DAYOFWEEK{% elif date_part == \'DOY\' %}DAYOFYEAR{% else %}{{ date_part }}{% endif %} FROM {{ expr }})';
-        templates.expressions.timestamp_literal = 'DATETIME(TIMESTAMP(\'{{ value }}\'))';
+        templates.expressions.timestamp_literal = 'TIMESTAMP(\'{{ value }}\')';
+        templates.expressions.rolling_window_expr_timestamp_cast = 'TIMESTAMP({{ value }})';
         delete templates.expressions.ilike;
         delete templates.expressions.like_escape;
         templates.filters.like_pattern = 'CONCAT({% if start_wild %}\'%\'{% else %}\'\'{% endif %}, LOWER({{ value }}), {% if end_wild %}\'%\'{% else %}\'\'{% endif %})';
         templates.tesseract.ilike = 'LOWER({{ expr }}) {% if negated %}NOT {% endif %} LIKE {{ pattern }}';
+        templates.tesseract.series_bounds_cast = 'TIMESTAMP({{ expr }})';
         templates.types.boolean = 'BOOL';
         templates.types.float = 'FLOAT64';
         templates.types.double = 'FLOAT64';

package/dist/src/adapter/BigqueryQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"BigqueryQuery.js","sourceRoot":"","sources":["../../../src/adapter/BigqueryQuery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BigqueryQuery.js","sourceRoot":"","sources":["../../../src/adapter/BigqueryQuery.ts"],"names":[],"mappings":"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"}

package/dist/src/adapter/ClickHouseQuery.d.ts

@@ -21,8 +21,10 @@ export declare class ClickHouseQuery extends BaseQuery {
     timeStampCast(value: string): string;
     dateTimeCast(value: string): string;
     dimensionsJoinCondition(leftAlias: any, rightAlias: any): string;
-    getFieldAlias(id: any): any;
-    orderHashToString(hash: any): string | null;
+    orderHashToString(hash: {
+        id: string;
+        desc: boolean;
+    }): string | null;
     groupByClause(): string;
     primaryKeyCount(cubeName: any, distinct: any): string;
     castToString(sql: any): string;

package/dist/src/adapter/ClickHouseQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClickHouseQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/ClickHouseQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AA4BxD,qBAAa,eAAgB,SAAQ,SAAS;IACrC,SAAS,CAAC,MAAM,KAAA;IAIhB,gBAAgB,CAAC,IAAI,KAAA;IAIrB,SAAS,CAAC,KAAK,KAAA;IAWf,iBAAiB,CAAC,WAAW,KAAA,EAAE,SAAS,KAAA;IAY/C;;;OAGG;IACI,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAcjE,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAIxD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAI1D;;;;OAIG;IACH,OAAO,CAAC,cAAc;IAQf,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAIpC,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAQnC,uBAAuB,CAAC,SAAS,KAAA,EAAE,UAAU,KAAA;IAU7C,aAAa,CAAC,EAAE,KAAA;IA0BhB,iBAAiB,CAAC,IAAI,KAAA;IAmBtB,aAAa;IAYb,eAAe,CAAC,QAAQ,KAAA,EAAE,QAAQ,KAAA;IAYlC,YAAY,CAAC,GAAG,KAAA;IAIhB,SAAS,CAAC,aAAa,EAAE,iBAAiB;IA2C1C,gBAAgB,CAAC,OAAO,KAAA;IAKxB,gBAAgB;IAIhB,qBAAqB,CAAC,IAAI,KAAA,EAAE,cAAc,KAAA,EAAE,SAAS,KAAA;IAUrD,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIxC,cAAc,CAAC,SAAS,KAAA,EAAE,SAAS,KAAA,EAAE,cAAc,KAAA;IAInD,YAAY;CAkBpB"}
+{"version":3,"file":"ClickHouseQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/ClickHouseQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AA4BxD,qBAAa,eAAgB,SAAQ,SAAS;IACrC,SAAS,CAAC,MAAM,KAAA;IAIhB,gBAAgB,CAAC,IAAI,KAAA;IAIrB,SAAS,CAAC,KAAK,KAAA;IAWf,iBAAiB,CAAC,WAAW,KAAA,EAAE,SAAS,KAAA;IAY/C;;;OAGG;IACI,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAcjE,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAIxD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAI1D;;;;OAIG;IACH,OAAO,CAAC,cAAc;IAQf,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAIpC,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAQnC,uBAAuB,CAAC,SAAS,KAAA,EAAE,UAAU,KAAA;IAUpC,iBAAiB,CAAC,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE;IAmB9D,aAAa;IAYb,eAAe,CAAC,QAAQ,KAAA,EAAE,QAAQ,KAAA;IAYlC,YAAY,CAAC,GAAG,KAAA;IAIhB,SAAS,CAAC,aAAa,EAAE,iBAAiB;IA2C1C,gBAAgB,CAAC,OAAO,KAAA;IAKxB,gBAAgB;IAIhB,qBAAqB,CAAC,IAAI,KAAA,EAAE,cAAc,KAAA,EAAE,SAAS,KAAA;IAUrD,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIxC,cAAc,CAAC,SAAS,KAAA,EAAE,SAAS,KAAA,EAAE,cAAc,KAAA;IAInD,YAAY;CAkBpB"}

package/dist/src/adapter/ClickHouseQuery.js

@@ -109,19 +109,6 @@ class ClickHouseQuery extends BaseQuery_1.BaseQuery {
             .map(alias => `(assumeNotNull(${leftAlias}.${alias}) = assumeNotNull(${rightAlias}.${alias}))`)
             .join(' AND ');
     }
-    getFieldAlias(id) {
-        const equalIgnoreCase = (a, b) => (typeof a === 'string' && typeof b === 'string' && a.toUpperCase() === b.toUpperCase());
-        let field;
-        field = this.dimensionsForSelect().find(d => equalIgnoreCase(d.dimension, id));
-        if (field) {
-            return field.aliasName();
-        }
-        field = this.measures.find(d => equalIgnoreCase(d.measure, id) || equalIgnoreCase(d.expressionName, id));
-        if (field) {
-            return field.aliasName();
-        }
-        return null;
-    }
     orderHashToString(hash) {
         //
         // ClickHouse doesn't support order by index column, so map these to the alias names

package/dist/src/adapter/ClickHouseQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"ClickHouseQuery.js","sourceRoot":"","sources":["../../../src/adapter/ClickHouseQuery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ClickHouseQuery.js","sourceRoot":"","sources":["../../../src/adapter/ClickHouseQuery.ts"],"names":[],"mappings":"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"}

package/dist/src/adapter/ElasticSearchQuery.d.ts

@@ -9,8 +9,15 @@ export declare class ElasticSearchQuery extends BaseQuery {
     timeGroupedColumn(granularity: any, dimension: any): any;
     unixTimestampSql(): string;
     groupByClause(): string;
-    orderHashToString(hash: any): string | null;
-    getFieldAlias(id: any): any;
+    orderHashToString(hash: {
+        id: string;
+        desc: boolean;
+    }): string | null;
+    /**
+     * This implementation is a bit different from the one in BaseQuery
+     * as it uses dimensionSql() as ordering expression
+     */
+    getFieldAlias(id: string): string | null;
     escapeColumnName(name: any): string;
 }
 //# sourceMappingURL=ElasticSearchQuery.d.ts.map

package/dist/src/adapter/ElasticSearchQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ElasticSearchQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/ElasticSearchQuery.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AA0BxC,qBAAa,kBAAmB,SAAQ,SAAS;IACxC,SAAS,CAAC,MAAM,KAAA;IAIhB,SAAS,CAAC,KAAK,KAAA;IAIf,aAAa,CAAC,KAAK,KAAA;IAInB,YAAY,CAAC,KAAK,KAAA;IAIlB,gBAAgB,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAK/B,WAAW,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAK1B,iBAAiB,CAAC,WAAW,KAAA,EAAE,SAAS,KAAA;IAIxC,gBAAgB;IAIhB,aAAa;IAYb,iBAAiB,CAAC,IAAI,KAAA;IAetB,aAAa,CAAC,EAAE,KAAA;IAwBhB,gBAAgB,CAAC,IAAI,KAAA;CAG7B"}
+{"version":3,"file":"ElasticSearchQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/ElasticSearchQuery.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AA6BxC,qBAAa,kBAAmB,SAAQ,SAAS;IAC/B,SAAS,CAAC,MAAM,KAAA;IAIhB,SAAS,CAAC,KAAK,KAAA;IAIf,aAAa,CAAC,KAAK,KAAA;IAInB,YAAY,CAAC,KAAK,KAAA;IAIlB,gBAAgB,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAK/B,WAAW,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAK1B,iBAAiB,CAAC,WAAW,KAAA,EAAE,SAAS,KAAA;IAIxC,gBAAgB;IAIhB,aAAa;IAYb,iBAAiB,CAAC,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE;IAerE;;;OAGG;IACI,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAsD/B,gBAAgB,CAAC,IAAI,KAAA;CAGtC"}

package/dist/src/adapter/ElasticSearchQuery.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ElasticSearchQuery = void 0;
 /* eslint-disable max-classes-per-file */
 const ramda_1 = __importDefault(require("ramda"));
+const shared_1 = require("@cubejs-backend/shared");
 const BaseQuery_1 = require("./BaseQuery");
 const BaseFilter_1 = require("./BaseFilter");
 const GRANULARITY_TO_INTERVAL = {
@@ -77,14 +78,36 @@ class ElasticSearchQuery extends BaseQuery_1.BaseQuery {
         const direction = hash.desc ? 'DESC' : 'ASC';
         return `${fieldAlias} ${direction}`;
     }
+    /**
+     * This implementation is a bit different from the one in BaseQuery
+     * as it uses dimensionSql() as ordering expression
+     */
     getFieldAlias(id) {
-        const equalIgnoreCase = (a, b) => typeof a === 'string' &&
-            typeof b === 'string' &&
-            a.toUpperCase() === b.toUpperCase();
+        const equalIgnoreCase = (a, b) => (typeof a === 'string' && typeof b === 'string' && a.toUpperCase() === b.toUpperCase());
         let field;
-        field = this.dimensionsForSelect().find(d => equalIgnoreCase(d.dimension, id));
-        if (field) {
-            return field.dimensionSql();
+        const path = id.split('.');
+        // Granularity is specified
+        if (path.length === 3) {
+            const memberName = path.slice(0, 2).join('.');
+            const granularity = path[2];
+            field = this.timeDimensions
+                // Not all time dimensions are used in select list, some are just filters,
+                // but they exist in this.timeDimensions, so need to filter them out
+                .filter(d => d.selectColumns())
+                .find(d => ((equalIgnoreCase(d.dimension, memberName) && (d.granularityObj?.granularity === granularity)) ||
+                equalIgnoreCase(d.expressionName, memberName)));
+            if (field) {
+                return field.dimensionSql();
+            }
+            return null;
+        }
+        const dimensionsForSelect = this.dimensionsForSelect()
+            // Not all time dimensions are used in select list, some are just filters,
+            // but they exist in this.timeDimensions, so need to filter them out
+            .filter(d => d.selectColumns());
+        const found = (0, shared_1.findMinGranularityDimension)(id, dimensionsForSelect);
+        if (found?.dimension) {
+            return found.dimension.dimensionSql();
         }
         field = this.measures.find(d => equalIgnoreCase(d.measure, id) || equalIgnoreCase(d.expressionName, id));
         if (field) {
@@ -93,7 +116,7 @@ class ElasticSearchQuery extends BaseQuery_1.BaseQuery {
         return null;
     }
     escapeColumnName(name) {
-        return `${name}`; // TODO
+        return `${name}`;
     }
 }
 exports.ElasticSearchQuery = ElasticSearchQuery;

package/dist/src/adapter/ElasticSearchQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"ElasticSearchQuery.js","sourceRoot":"","sources":["../../../src/adapter/ElasticSearchQuery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ElasticSearchQuery.js","sourceRoot":"","sources":["../../../src/adapter/ElasticSearchQuery.ts"],"names":[],"mappings":"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"}

package/dist/src/adapter/HiveQuery.d.ts

@@ -15,7 +15,7 @@ export declare class HiveQuery extends BaseQuery {
     simpleQuery(): string;
     seriesSql(timeDimension: any): string;
     groupByClause(): string;
-    getFieldIndex(id: any): string | number | null;
+    getFieldIndex(id: any): string | number;
     unixTimestampSql(): string;
     defaultRefreshKeyRenewalThreshold(): number;
 }

package/dist/src/adapter/HiveQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HiveQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/HiveQuery.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAY1C,cAAM,UAAW,SAAQ,UAAU;IAC1B,cAAc,CAAC,MAAM,KAAA,EAAE,GAAG,KAAA,EAAE,KAAK,KAAA,EAAE,IAAI,KAAA;CAK/C;AAED,qBAAa,SAAU,SAAQ,SAAS;IAC/B,SAAS,CAAC,MAAM,KAAA;IAIhB,SAAS,CAAC,KAAK,KAAA;IAIf,aAAa,CAAC,KAAK,KAAA;IAInB,YAAY,CAAC,KAAK,KAAA;IAIlB,gBAAgB,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAM/B,WAAW,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAM1B,iBAAiB,CAAC,WAAW,KAAA,EAAE,SAAS,KAAA;IAIxC,gBAAgB,CAAC,IAAI,KAAA;IAIrB,WAAW;IAiBX,SAAS,CAAC,aAAa,KAAA;IAOvB,aAAa;IASb,aAAa,CAAC,EAAE,KAAA;IAQhB,gBAAgB;IAIhB,iCAAiC;CAGzC"}
+{"version":3,"file":"HiveQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/HiveQuery.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAY1C,cAAM,UAAW,SAAQ,UAAU;IAC1B,cAAc,CAAC,MAAM,KAAA,EAAE,GAAG,KAAA,EAAE,KAAK,KAAA,EAAE,IAAI,KAAA;CAK/C;AAED,qBAAa,SAAU,SAAQ,SAAS;IAC/B,SAAS,CAAC,MAAM,KAAA;IAIhB,SAAS,CAAC,KAAK,KAAA;IAIf,aAAa,CAAC,KAAK,KAAA;IAInB,YAAY,CAAC,KAAK,KAAA;IAIlB,gBAAgB,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAM/B,WAAW,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAM1B,iBAAiB,CAAC,WAAW,KAAA,EAAE,SAAS,KAAA;IAIxC,gBAAgB,CAAC,IAAI,KAAA;IAIrB,WAAW;IAiBX,SAAS,CAAC,aAAa,KAAA;IAOvB,aAAa;IASb,aAAa,CAAC,EAAE,KAAA;IAUhB,gBAAgB;IAIhB,iCAAiC;CAGzC"}

package/dist/src/adapter/HiveQuery.js

@@ -70,9 +70,9 @@ class HiveQuery extends BaseQuery_1.BaseQuery {
         return dimensionColumns.length ? ` GROUP BY ${dimensionColumns.join(', ')}` : '';
     }
     getFieldIndex(id) {
-        const dimension = this.dimensionsForSelect().find(d => d.dimension === id);
-        if (dimension) {
-            return super.getFieldIndex(id);
+        const idx = super.getFieldIndex(id);
+        if (idx !== null) {
+            return idx;
         }
         return this.escapeColumnName(this.aliasName(id));
     }

package/dist/src/adapter/HiveQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"HiveQuery.js","sourceRoot":"","sources":["../../../src/adapter/HiveQuery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"HiveQuery.js","sourceRoot":"","sources":["../../../src/adapter/HiveQuery.ts"],"names":[],"mappings":"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"}

package/dist/src/adapter/PostgresQuery.js

@@ -76,11 +76,11 @@ class PostgresQuery extends BaseQuery_1.BaseQuery {
         templates.types.binary = 'BYTEA';
         templates.operators.is_not_distinct_from = 'IS NOT DISTINCT FROM';
         templates.statements.generated_time_series_select = 'SELECT d AS "date_from",\n' +
-            'd + interval \'{{ granularity }}\' - interval \'1 millisecond\' AS "date_to" \n' +
-            'FROM generate_series({{ start }}::timestamp, {{ end }}:: timestamp, \'{{ granularity }}\'::interval) d ';
+            'd + interval {{ granularity }} - interval \'1 millisecond\' AS "date_to" \n' +
+            'FROM generate_series({{ start }}::timestamp, {{ end }}:: timestamp, {{ granularity }}::interval) d ';
         templates.statements.generated_time_series_with_cte_range_source = 'SELECT d AS "date_from",\n' +
-            'd + interval \'{{ granularity }}\' - interval \'1 millisecond\' AS "date_to" \n' +
-            'FROM {{ range_source }}, LATERAL generate_series({{ range_source }}.{{ min_name }}, {{ range_source }}.{{ max_name }}, \'{{ granularity }}\'::interval) d ';
+            'd + interval {{ granularity }} - interval \'1 millisecond\' AS "date_to" \n' +
+            'FROM {{ range_source }}, LATERAL generate_series({{ range_source }}.{{ min_name }}, {{ range_source }}.{{ max_name }}, {{ granularity }}::interval) d ';
         return templates;
     }
     get shouldReuseParams() {

package/dist/src/adapter/PostgresQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"PostgresQuery.js","sourceRoot":"","sources":["../../../src/adapter/PostgresQuery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PostgresQuery.js","sourceRoot":"","sources":["../../../src/adapter/PostgresQuery.ts"],"names":[],"mappings":"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"}

package/dist/src/adapter/PrestodbQuery.d.ts

@@ -12,8 +12,7 @@ export declare class PrestodbQuery extends BaseQuery {
      */
     dateBin(interval: string, source: string, origin: string): string;
     timeGroupedColumn(granularity: any, dimension: any): string;
-    subtractInterval(date: any, interval: any): string;
-    addInterval(date: any, interval: any): string;
+    intervalString(interval: string): string;
     seriesSql(timeDimension: any): string;
     unixTimestampSql(): string;
     defaultRefreshKeyRenewalThreshold(): number;

package/dist/src/adapter/PrestodbQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PrestodbQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/PrestodbQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAiCxC,qBAAa,aAAc,SAAQ,SAAS;IACnC,SAAS,CAAC,MAAM,KAAA;IAIhB,cAAc;IAId,aAAa,CAAC,KAAK,KAAA;IAInB,YAAY,CAAC,KAAK,KAAA;IAIlB,SAAS,CAAC,KAAK,KAAA;IAOtB;;;;OAIG;IACI,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAmBjE,iBAAiB,CAAC,WAAW,KAAA,EAAE,SAAS,KAAA;IAIxC,gBAAgB,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAK/B,WAAW,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAK1B,SAAS,CAAC,aAAa,KAAA;IAOvB,gBAAgB;IAIhB,iCAAiC;IAIjC,sBAAsB;;;IAMtB,OAAO,CAAC,GAAG,KAAA;IAIX,QAAQ,CAAC,GAAG,KAAA;IAIZ,mBAAmB,CAAC,GAAG,KAAA;IAI9B,SAAS,CAAC,iBAAiB,CAAC,KAAK,KAAA,EAAE,MAAM,KAAA;IAMlC,YAAY;IAuBZ,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM;CAGtC"}
+{"version":3,"file":"PrestodbQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/PrestodbQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAiCxC,qBAAa,aAAc,SAAQ,SAAS;IACnC,SAAS,CAAC,MAAM,KAAA;IAIhB,cAAc;IAId,aAAa,CAAC,KAAK,KAAA;IAInB,YAAY,CAAC,KAAK,KAAA;IAIlB,SAAS,CAAC,KAAK,KAAA;IAOtB;;;;OAIG;IACI,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAmBjE,iBAAiB,CAAC,WAAW,KAAA,EAAE,SAAS,KAAA;IAIxC,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAKxC,SAAS,CAAC,aAAa,KAAA;IAOvB,gBAAgB;IAIhB,iCAAiC;IAIjC,sBAAsB;;;IAMtB,OAAO,CAAC,GAAG,KAAA;IAIX,QAAQ,CAAC,GAAG,KAAA;IAIZ,mBAAmB,CAAC,GAAG,KAAA;IAI9B,SAAS,CAAC,iBAAiB,CAAC,KAAK,KAAA,EAAE,MAAM,KAAA;IAMlC,YAAY;IAiDZ,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM;CAGtC"}