@cubejs-backend/schema-compiler 1.3.23 → 1.3.25

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

@@ -1,15 +1,9 @@
-import { BaseQuery } from './BaseQuery';
-export declare class AWSElasticSearchQuery extends BaseQuery {
+import { ElasticSearchQuery } from './ElasticSearchQuery';
+export declare class AWSElasticSearchQuery extends ElasticSearchQuery {
     newFilter(filter: any): any;
-    convertTz(field: any): string;
-    timeStampCast(value: any): string;
-    dateTimeCast(value: any): string;
     subtractInterval(date: any, interval: any): string;
     addInterval(date: any, interval: any): string;
     timeGroupedColumn(granularity: any, dimension: any): any;
-    groupByClause(): string;
-    orderHashToString(hash: any): string | null;
-    getFieldAlias(id: any): any;
-    escapeColumnName(name: any): string;
+    unixTimestampSql(): string;
 }
 //# sourceMappingURL=AWSElasticSearchQuery.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"AWSElasticSearchQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/AWSElasticSearchQuery.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAqBxC,qBAAa,qBAAsB,SAAQ,SAAS;IAC3C,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;IAI/B,WAAW,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAI1B,iBAAiB,CAAC,WAAW,KAAA,EAAE,SAAS,KAAA;IAIxC,aAAa;IAUb,iBAAiB,CAAC,IAAI,KAAA;IAetB,aAAa,CAAC,EAAE,KAAA;IAsBhB,gBAAgB,CAAC,IAAI,KAAA;CAG7B"}
+{"version":3,"file":"AWSElasticSearchQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/AWSElasticSearchQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAqB1D,qBAAa,qBAAsB,SAAQ,kBAAkB;IAC3C,SAAS,CAAC,MAAM,KAAA;IAIhB,gBAAgB,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAI/B,WAAW,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAI1B,iBAAiB,CAAC,WAAW,KAAA,EAAE,SAAS,KAAA;IAIxC,gBAAgB;CAGjC"}

package/dist/src/adapter/AWSElasticSearchQuery.js

@@ -1,12 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AWSElasticSearchQuery = void 0;
-const ramda_1 = __importDefault(require("ramda"));
 const BaseFilter_1 = require("./BaseFilter");
-const BaseQuery_1 = require("./BaseQuery");
+const ElasticSearchQuery_1 = require("./ElasticSearchQuery");
 const GRANULARITY_TO_INTERVAL = {
     day: (date) => `DATE_FORMAT(${date}, 'yyyy-MM-dd 00:00:00.000')`,
     // eslint-disable-next-line no-unused-vars,@typescript-eslint/no-unused-vars
@@ -24,19 +20,10 @@ class AWSElasticSearchQueryFilter extends BaseFilter_1.BaseFilter {
         return `${column}${not ? ' NOT' : ''} LIKE CONCAT('${p}', ${this.allocateParam(param)}, '${s}')`;
     }
 }
-class AWSElasticSearchQuery extends BaseQuery_1.BaseQuery {
+class AWSElasticSearchQuery extends ElasticSearchQuery_1.ElasticSearchQuery {
     newFilter(filter) {
         return new AWSElasticSearchQueryFilter(this, filter);
     }
-    convertTz(field) {
-        return `${field}`; // TODO
-    }
-    timeStampCast(value) {
-        return `${value}`;
-    }
-    dateTimeCast(value) {
-        return `${value}`; // TODO
-    }
     subtractInterval(date, interval) {
         return `DATE_SUB(${date}, INTERVAL ${interval})`;
     }
@@ -46,41 +33,8 @@ class AWSElasticSearchQuery extends BaseQuery_1.BaseQuery {
     timeGroupedColumn(granularity, dimension) {
         return GRANULARITY_TO_INTERVAL[granularity](dimension);
     }
-    groupByClause() {
-        if (this.ungrouped) {
-            return '';
-        }
-        const dimensionsForSelect = this.dimensionsForSelect();
-        const dimensionColumns = ramda_1.default.flatten(dimensionsForSelect.map(s => s.selectColumns() && s.dimensionSql()))
-            .filter(s => !!s);
-        return dimensionColumns.length ? ` GROUP BY ${dimensionColumns.join(', ')}` : '';
-    }
-    orderHashToString(hash) {
-        if (!hash || !hash.id) {
-            return null;
-        }
-        const fieldAlias = this.getFieldAlias(hash.id);
-        if (fieldAlias === null) {
-            return null;
-        }
-        const direction = hash.desc ? 'DESC' : 'ASC';
-        return `${fieldAlias} ${direction}`;
-    }
-    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.dimensionSql();
-        }
-        field = this.measures.find(d => equalIgnoreCase(d.measure, id) || equalIgnoreCase(d.expressionName, id));
-        if (field) {
-            return field.aliasName(); // TODO isn't supported
-        }
-        return null;
-    }
-    escapeColumnName(name) {
-        return `${name}`; // TODO
+    unixTimestampSql() {
+        return 'EXTRACT(EPOCH FROM NOW())';
     }
 }
 exports.AWSElasticSearchQuery = AWSElasticSearchQuery;

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

@@ -1 +1 @@
-{"version":3,"file":"AWSElasticSearchQuery.js","sourceRoot":"","sources":["../../../src/adapter/AWSElasticSearchQuery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AWSElasticSearchQuery.js","sourceRoot":"","sources":["../../../src/adapter/AWSElasticSearchQuery.ts"],"names":[],"mappings":";;;AAAA,6CAA0C;AAC1C,6DAA0D;AAE1D,MAAM,uBAAuB,GAAG;IAC9B,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,IAAI,8BAA8B;IAChE,4EAA4E;IAC5E,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,GAAG,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAC3D,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,IAAI,8BAA8B;IACjE,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,IAAI,8BAA8B;IACnE,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,IAAI,8BAA8B;IACnE,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,IAAI,8BAA8B;IAClE,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,IAAI,8BAA8B;CAClE,CAAC;AAEF,MAAM,2BAA4B,SAAQ,uBAAU;IAC3C,cAAc,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI;QAC5C,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,IAAI,KAAK,UAAU,IAAI,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACvE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,IAAI,KAAK,UAAU,IAAI,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACzE,OAAO,GAAG,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,iBAAiB,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC;IACnG,CAAC;CACF;AAED,MAAa,qBAAsB,SAAQ,uCAAkB;IAC3C,SAAS,CAAC,MAAM;QAC9B,OAAO,IAAI,2BAA2B,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACvD,CAAC;IAEe,gBAAgB,CAAC,IAAI,EAAE,QAAQ;QAC7C,OAAO,YAAY,IAAI,cAAc,QAAQ,GAAG,CAAC;IACnD,CAAC;IAEe,WAAW,CAAC,IAAI,EAAE,QAAQ;QACxC,OAAO,YAAY,IAAI,cAAc,QAAQ,GAAG,CAAC;IACnD,CAAC;IAEe,iBAAiB,CAAC,WAAW,EAAE,SAAS;QACtD,OAAO,uBAAuB,CAAC,WAAW,CAAC,CAAC,SAAS,CAAC,CAAC;IACzD,CAAC;IAEe,gBAAgB;QAC9B,OAAO,2BAA2B,CAAC;IACrC,CAAC;CACF;AApBD,sDAoBC"}

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

@@ -30,7 +30,7 @@ export declare class BaseMeasure {
     isAdditive(): boolean;
     static isCumulative(definition: any): boolean;
     rollingWindowDefinition(): any;
-    dateJoinCondition(): (import("./BaseTimeDimension").BaseTimeDimension | ((dateFrom: any, dateTo: any, dateField: any, dimensionDateFrom: any, dimensionDateTo: any, isFromStartToEnd: any) => string))[][] | null;
+    dateJoinCondition(): (import("./BaseTimeDimension").BaseTimeDimension | ((dateFrom: any, dateTo: any, dateField: any, _dimensionDateFrom: any, _dimensionDateTo: any, _isFromStartToEnd: any) => string))[][] | null;
     windowGranularity(): any;
     minGranularity(granularityA: string | undefined, granularityB: string | undefined): any;
     granularityFromInterval(interval: string): "day" | "hour" | "week" | "month" | "year" | undefined;

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

@@ -79,7 +79,14 @@ export class BaseQuery {
     /** @type {import('../compiler/JoinGraph').JoinGraph} */
     joinGraph: import('../compiler/JoinGraph').JoinGraph;
     options: any;
-    orderHashToString(hash: any): string | null;
+    /**
+     * @param {{ id: string, desc: boolean }} hash
+     * @returns {string|null}
+     */
+    orderHashToString(hash: {
+        id: string;
+        desc: boolean;
+    }): string | null;
     defaultOrder(): {
         id: any;
         desc: boolean;
@@ -237,9 +244,9 @@ export class BaseQuery {
      */
     buildLambdaQuery(): Record<string, Array<string>>;
     externalQuery(): any;
-    runningTotalDateJoinCondition(): (BaseTimeDimension | ((dateFrom: any, dateTo: any, dateField: any, dimensionDateFrom: any, dimensionDateTo: any) => string))[][];
-    rollingWindowToDateJoinCondition(granularity: any): (BaseTimeDimension | ((dateFrom: any, dateTo: any, dateField: any, dimensionDateFrom: any, dimensionDateTo: any, isFromStartToEnd: any) => string))[][];
-    rollingWindowDateJoinCondition(trailingInterval: any, leadingInterval: any, offset: any): (BaseTimeDimension | ((dateFrom: any, dateTo: any, dateField: any, dimensionDateFrom: any, dimensionDateTo: any, isFromStartToEnd: any) => string))[][];
+    runningTotalDateJoinCondition(): (BaseTimeDimension | ((_dateFrom: any, dateTo: any, dateField: any, dimensionDateFrom: any, _dimensionDateTo: any) => string))[][];
+    rollingWindowToDateJoinCondition(granularity: any): (BaseTimeDimension | ((dateFrom: any, dateTo: any, dateField: any, _dimensionDateFrom: any, _dimensionDateTo: any, _isFromStartToEnd: any) => string))[][];
+    rollingWindowDateJoinCondition(trailingInterval: any, leadingInterval: any, offset: any): (BaseTimeDimension | ((dateFrom: any, dateTo: any, dateField: any, _dimensionDateFrom: any, _dimensionDateTo: any, isFromStartToEnd: any) => string))[][];
     /**
      * @param {string} date
      * @param {string} interval
@@ -252,6 +259,11 @@ export class BaseQuery {
      * @returns {string}
      */
     addInterval(date: string, interval: string): string;
+    /**
+     * @param {string} interval
+     * @returns {string}
+     */
+    intervalString(interval: string): string;
     /**
      * @param {string} timestamp
      * @param {string} interval
@@ -306,7 +318,12 @@ export class BaseQuery {
     overTimeSeriesQuery(baseQueryFn: any, cumulativeMeasure: any, fromRollup: any): any;
     overTimeSeriesSelect(cumulativeMeasures: any, dateSeriesSql: any, baseQuery: any, dateJoinConditionSql: any, baseQueryAlias: any, dateSeriesGranularity: any): string;
     overTimeSeriesForSelect(cumulativeMeasures: any, dateSeriesGranularity: any): string;
-    dateFromStartToEndConditionSql(dateJoinCondition: any, fromRollup: any, isFromStartToEnd: any): any;
+    /**
+     * BigQuery has strict date type and can not automatically convert between date
+     * and timestamp, so we override dateFromStartToEndConditionSql() in BigQuery Dialect
+     * @protected
+     */
+    protected dateFromStartToEndConditionSql(dateJoinCondition: any, fromRollup: any, isFromStartToEnd: any): any;
     /**
      * @param {import('./BaseTimeDimension').BaseTimeDimension} timeDimension
      * @return {string}
@@ -410,6 +427,17 @@ export class BaseQuery {
      * @returns {Array<Array<string>>}
      */
     collectJoinHints(excludeTimeDimensions?: boolean | undefined): Array<Array<string>>;
+    joinMembersFromCustomSubQuery(): {
+        getMembers: () => {
+            path: () => null;
+            cube: () => any;
+            definition: () => {
+                sql: Function;
+                type: string;
+            };
+        }[];
+    }[];
+    joinMembersFromJoin(join: any): any;
     collectJoinHintsFromMembers(members: any): any[];
     collectFromMembers(excludeTimeDimensions: any, fn: any, methodName: any): any[];
     /**
@@ -433,11 +461,18 @@ export class BaseQuery {
      */
     groupByClause(): string;
     /**
-     * XXX: String as return value is added because of HiveQuery.getFieldIndex()
-     * @param id
+     * XXX: String as return value is added because of HiveQuery.getFieldIndex() and DatabricksQuery.getFieldIndex()
+     * @protected
+     * @param {string} id member name in form of "cube.member[.granularity]"
      * @returns {number|string|null}
      */
-    getFieldIndex(id: any): number | string | null;
+    protected getFieldIndex(id: string): number | string | null;
+    /**
+     * @protected
+     * @param {string} id member name in form of "cube.member[.granularity]"
+     * @returns {null|string}
+     */
+    protected getFieldAlias(id: string): null | string;
     orderBy(): string;
     /**
      * Returns a complete list of the aliased dimensions, including time

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

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

package/dist/src/adapter/BaseQuery.js

@@ -377,10 +377,67 @@ class BaseQuery {
      */
     get allJoinHints() {
         if (!this.collectedJoinHints) {
-            this.collectedJoinHints = [
-                ...this.queryLevelJoinHints,
-                ...this.collectJoinHints(),
-            ];
+            const [rootOfJoin, ...allMembersJoinHints] = this.collectJoinHintsFromMembers(this.allMembersConcat(false));
+            const customSubQueryJoinHints = this.collectJoinHintsFromMembers(this.joinMembersFromCustomSubQuery());
+            let joinMembersJoinHints = this.collectJoinHintsFromMembers(this.joinMembersFromJoin(this.join));
+            // One cube may join the other cube via transitive joined cubes,
+            // members from which are referenced in the join `on` clauses.
+            // We need to collect such join hints and push them upfront of the joining one
+            // but only if they don't exist yet. Cause in other case we might affect what
+            // join path will be constructed in join graph.
+            // It is important to use queryLevelJoinHints during the calculation if it is set.
+            const constructJH = () => {
+                const filteredJoinMembersJoinHints = joinMembersJoinHints.filter(m => !allMembersJoinHints.includes(m));
+                return [
+                    ...this.queryLevelJoinHints,
+                    ...(rootOfJoin ? [rootOfJoin] : []),
+                    ...filteredJoinMembersJoinHints,
+                    ...allMembersJoinHints,
+                    ...customSubQueryJoinHints,
+                ];
+            };
+            let prevJoins = this.join;
+            let prevJoinMembersJoinHints = joinMembersJoinHints;
+            let newJoin = this.joinGraph.buildJoin(constructJH());
+            const isOrderPreserved = (base, updated) => {
+                const common = base.filter(value => updated.includes(value));
+                const bFiltered = updated.filter(value => common.includes(value));
+                return common.every((x, i) => x === bFiltered[i]);
+            };
+            const isJoinTreesEqual = (a, b) => {
+                if (!a || !b || a.root !== b.root || a.joins.length !== b.joins.length) {
+                    return false;
+                }
+                // We don't care about the order of joins on the same level, so
+                // we can compare them as sets.
+                const aJoinsSet = new Set(a.joins.map(j => `${j.originalFrom}->${j.originalTo}`));
+                const bJoinsSet = new Set(b.joins.map(j => `${j.originalFrom}->${j.originalTo}`));
+                if (aJoinsSet.size !== bJoinsSet.size) {
+                    return false;
+                }
+                for (const val of aJoinsSet) {
+                    if (!bJoinsSet.has(val)) {
+                        return false;
+                    }
+                }
+                return true;
+            };
+            // Safeguard against infinite loop in case of cyclic joins somehow managed to slip through
+            let cnt = 0;
+            while (newJoin?.joins.length > 0 && !isJoinTreesEqual(prevJoins, newJoin) && cnt < 10000) {
+                prevJoins = newJoin;
+                joinMembersJoinHints = this.collectJoinHintsFromMembers(this.joinMembersFromJoin(newJoin));
+                if (!isOrderPreserved(prevJoinMembersJoinHints, joinMembersJoinHints)) {
+                    throw new UserError_1.UserError(`Can not construct joins for the query, potential loop detected: ${prevJoinMembersJoinHints.join('->')} vs ${joinMembersJoinHints.join('->')}`);
+                }
+                newJoin = this.joinGraph.buildJoin(constructJH());
+                prevJoinMembersJoinHints = joinMembersJoinHints;
+                cnt++;
+            }
+            if (cnt >= 10000) {
+                throw new UserError_1.UserError('Can not construct joins for the query, potential loop detected');
+            }
+            this.collectedJoinHints = ramda_1.default.uniq(constructJH());
         }
         return this.collectedJoinHints;
     }
@@ -447,8 +504,9 @@ class BaseQuery {
             res.push({ id, desc: true });
         }
         else if (this.dimensions.length > 0) {
+            const dim = this.dimensions[0];
             res.push({
-                id: this.dimensions[0].dimension,
+                id: dim.expressionName ?? dim.dimension,
                 desc: false,
             });
         }
@@ -800,8 +858,7 @@ class BaseQuery {
         return this.timeDimensions
             .map(d => [
             d,
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            (dateFrom, dateTo, dateField, dimensionDateFrom, dimensionDateTo) => `${dateField} >= ${dimensionDateFrom} AND ${dateField} <= ${dateTo}`
+            (_dateFrom, dateTo, dateField, dimensionDateFrom, _dimensionDateTo) => `${dateField} >= ${dimensionDateFrom} AND ${dateField} <= ${dateTo}`
         ]);
     }
     rollingWindowToDateJoinCondition(granularity) {
@@ -809,14 +866,14 @@ class BaseQuery {
             .filter(td => td.granularity)
             .map(d => [
             d,
-            (dateFrom, dateTo, dateField, dimensionDateFrom, dimensionDateTo, isFromStartToEnd) => `${dateField} >= ${this.timeGroupedColumn(granularity, dateFrom)} AND ${dateField} <= ${dateTo}`
+            (dateFrom, dateTo, dateField, _dimensionDateFrom, _dimensionDateTo, _isFromStartToEnd) => `${dateField} >= ${this.timeGroupedColumn(granularity, dateFrom)} AND ${dateField} <= ${dateTo}`
         ]);
     }
     rollingWindowDateJoinCondition(trailingInterval, leadingInterval, offset) {
         offset = offset || 'end';
         return this.timeDimensions
             .filter(td => td.granularity)
-            .map(d => [d, (dateFrom, dateTo, dateField, dimensionDateFrom, dimensionDateTo, isFromStartToEnd) => {
+            .map(d => [d, (dateFrom, dateTo, dateField, _dimensionDateFrom, _dimensionDateTo, isFromStartToEnd) => {
                 // dateFrom based window
                 const conditions = [];
                 if (trailingInterval !== 'unbounded') {
@@ -840,7 +897,8 @@ class BaseQuery {
      * @returns {string}
      */
     subtractInterval(date, interval) {
-        return `${date} - interval '${interval}'`;
+        const intervalStr = this.intervalString(interval);
+        return `${date} - interval ${intervalStr}`;
     }
     /**
      * @param {string} date
@@ -848,7 +906,15 @@ class BaseQuery {
      * @returns {string}
      */
     addInterval(date, interval) {
-        return `${date} + interval '${interval}'`;
+        const intervalStr = this.intervalString(interval);
+        return `${date} + interval ${intervalStr}`;
+    }
+    /**
+     * @param {string} interval
+     * @returns {string}
+     */
+    intervalString(interval) {
+        return `'${interval}'`;
     }
     /**
      * @param {string} timestamp
@@ -1409,7 +1475,15 @@ class BaseQuery {
             .concat(this.dateFromStartToEndConditionSql(uniqDateJoinCondition, fromRollup, true));
         const baseQuery = this.groupedUngroupedSelect(() => baseQueryFn(cumulativeMeasures, filters), cumulativeMeasure.shouldUngroupForCumulative(), !cumulativeMeasure.shouldUngroupForCumulative() && this.minGranularity(cumulativeMeasure.windowGranularity(), dateSeriesGranularity) || undefined);
         const baseQueryAlias = this.cubeAlias('base');
-        const dateJoinConditionSql = dateJoinCondition.map(([d, f]) => f(`${d.dateSeriesAliasName()}.${this.escapeColumnName('date_from')}`, `${d.dateSeriesAliasName()}.${this.escapeColumnName('date_to')}`, `${baseQueryAlias}.${d.aliasName()}`, `'${d.dateFromFormatted()}'`, `'${d.dateToFormatted()}'`)).join(' AND ');
+        const dateJoinConditionSql = dateJoinCondition.map(([d, f]) => f(
+        // Time-series table is generated differently in different dialects,
+        // but some dialects (like BigQuery) require strict date types and can not automatically convert
+        // between date and timestamp for comparisons, at the same time, time dimensions are expected to be
+        // timestamps, so we need to align types for join conditions/comparisons.
+        // But we can't do it here, as it would break interval maths used in some types of
+        // rolling window join conditions in some dialects (like Redshift), so we need to
+        // do casts granularly in rolling window join conditions functions.
+        `${d.dateSeriesAliasName()}.${this.escapeColumnName('date_from')}`, `${d.dateSeriesAliasName()}.${this.escapeColumnName('date_to')}`, `${baseQueryAlias}.${d.aliasName()}`, `'${d.dateFromFormatted()}'`, `'${d.dateToFormatted()}'`)).join(' AND ');
         return this.overTimeSeriesSelect(cumulativeMeasures, dateSeriesSql, baseQuery, dateJoinConditionSql, baseQueryAlias, dateSeriesDimension.granularity);
     }
     overTimeSeriesSelect(cumulativeMeasures, dateSeriesSql, baseQuery, dateJoinConditionSql, baseQueryAlias, dateSeriesGranularity) {
@@ -1426,9 +1500,13 @@ class BaseQuery {
             .filter(c => !!c)
             .join(', ');
     }
+    /**
+     * BigQuery has strict date type and can not automatically convert between date
+     * and timestamp, so we override dateFromStartToEndConditionSql() in BigQuery Dialect
+     * @protected
+     */
     dateFromStartToEndConditionSql(dateJoinCondition, fromRollup, isFromStartToEnd) {
         return dateJoinCondition.map(
-        // TODO these weird conversions to be strict typed for big query.
         // TODO Consider adding strict definitions of local and UTC time type
         ([d, f]) => ({
             filterToWhere: () => {
@@ -1855,7 +1933,17 @@ class BaseQuery {
             return [s.patchedMeasure.patchedFrom.cubeName].concat(this.evaluateSymbolSql(s.patchedMeasure.patchedFrom.cubeName, s.patchedMeasure.patchedFrom.name, s.definition()));
         }
         else {
-            return this.evaluateSql(s.cube().name, s.definition().sql);
+            const res = this.evaluateSql(s.cube().name, s.definition().sql);
+            if (s.isJoinCondition) {
+                // In a join between Cube A and Cube B, sql() may reference members from other cubes.
+                // These referenced cubes must be added as join hints before Cube B to ensure correct SQL generation.
+                const targetCube = s.targetCubeName();
+                let { joinHints } = this.safeEvaluateSymbolContext();
+                joinHints = joinHints.filter(e => e !== targetCube);
+                joinHints.push(targetCube);
+                this.safeEvaluateSymbolContext().joinHints = joinHints;
+            }
+            return res;
         }
     }
     /**
@@ -1871,7 +1959,15 @@ class BaseQuery {
      * @returns {Array<Array<string>>}
      */
     collectJoinHints(excludeTimeDimensions = false) {
-        const customSubQueryJoinMembers = this.customSubQueryJoins.map(j => {
+        const membersToCollectFrom = [
+            ...this.allMembersConcat(excludeTimeDimensions),
+            ...this.joinMembersFromJoin(this.join),
+            ...this.joinMembersFromCustomSubQuery(),
+        ];
+        return this.collectJoinHintsFromMembers(membersToCollectFrom);
+    }
+    joinMembersFromCustomSubQuery() {
+        return this.customSubQueryJoins.map(j => {
             const res = {
                 path: () => null,
                 cube: () => this.cubeEvaluator.cubeFromPath(j.on.cubeName),
@@ -1885,19 +1981,17 @@ class BaseQuery {
                 getMembers: () => [res],
             };
         });
-        const joinMembers = this.join ? this.join.joins.map(j => ({
+    }
+    joinMembersFromJoin(join) {
+        return join ? join.joins.map(j => ({
             getMembers: () => [{
                     path: () => null,
                     cube: () => this.cubeEvaluator.cubeFromPath(j.originalFrom),
                     definition: () => j.join,
+                    isJoinCondition: true,
+                    targetCubeName: () => j.originalTo,
                 }]
         })) : [];
-        const membersToCollectFrom = [
-            ...this.allMembersConcat(excludeTimeDimensions),
-            ...joinMembers,
-            ...customSubQueryJoinMembers,
-        ];
-        return this.collectJoinHintsFromMembers(membersToCollectFrom);
     }
     collectJoinHintsFromMembers(members) {
         return [
@@ -1966,20 +2060,38 @@ class BaseQuery {
         return this.rollupGroupByClause(dimensionNames);
     }
     /**
-     * XXX: String as return value is added because of HiveQuery.getFieldIndex()
-     * @param id
+     * XXX: String as return value is added because of HiveQuery.getFieldIndex() and DatabricksQuery.getFieldIndex()
+     * @protected
+     * @param {string} id member name in form of "cube.member[.granularity]"
      * @returns {number|string|null}
      */
     getFieldIndex(id) {
         const equalIgnoreCase = (a, b) => (typeof a === 'string' && typeof b === 'string' && a.toUpperCase() === b.toUpperCase());
-        let index;
-        index = this.dimensionsForSelect()
+        let index = -1;
+        const path = id.split('.');
+        // Granularity is specified
+        if (path.length === 3) {
+            const memberName = path.slice(0, 2).join('.');
+            const granularity = path[2];
+            index = 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())
+                .findIndex(d => ((equalIgnoreCase(d.dimension, memberName) && (d.granularityObj?.granularity === granularity)) ||
+                equalIgnoreCase(d.expressionName, memberName)));
+            if (index > -1) {
+                return index + 1;
+            }
+            // TODO IT would be nice to log a warning that requested member wasn't found, but we don't have a logger here
+            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())
-            .findIndex(d => equalIgnoreCase(d.dimension, id) || equalIgnoreCase(d.expressionName, id));
-        if (index > -1) {
-            return index + 1;
+            .filter(d => d.selectColumns());
+        const found = (0, shared_1.findMinGranularityDimension)(id, dimensionsForSelect);
+        if (found?.index > -1) {
+            return found.index + 1;
         }
         index = this.measures.findIndex(d => equalIgnoreCase(d.measure, id) || equalIgnoreCase(d.expressionName, id));
         if (index > -1) {
@@ -1988,6 +2100,48 @@ class BaseQuery {
         }
         return null;
     }
+    /**
+     * @protected
+     * @param {string} id member name in form of "cube.member[.granularity]"
+     * @returns {null|string}
+     */
+    getFieldAlias(id) {
+        const equalIgnoreCase = (a, b) => (typeof a === 'string' && typeof b === 'string' && a.toUpperCase() === b.toUpperCase());
+        let field;
+        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.aliasName();
+            }
+            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.aliasName();
+        }
+        field = this.measures.find((d) => equalIgnoreCase(d.measure, id) || equalIgnoreCase(d.expressionName, id));
+        if (field) {
+            return field.aliasName();
+        }
+        return null;
+    }
+    /**
+     * @param {{ id: string, desc: boolean }} hash
+     * @returns {string|null}
+     */
     orderHashToString(hash) {
         if (!hash || !hash.id) {
             return null;
@@ -2137,7 +2291,7 @@ class BaseQuery {
     }
     pushJoinHints(joinHints) {
         if (this.safeEvaluateSymbolContext().joinHints && joinHints) {
-            if (joinHints.length === 1) {
+            if (Array.isArray(joinHints) && joinHints.length === 1) {
                 [joinHints] = joinHints;
             }
             this.safeEvaluateSymbolContext().joinHints.push(joinHints);
@@ -3105,9 +3259,11 @@ class BaseQuery {
                 like_escape: '{{ like_expr }} ESCAPE {{ escape_char }}',
                 within_group: '{{ fun_sql }} WITHIN GROUP (ORDER BY {{ within_group_concat }})',
                 concat_strings: '{{ strings | join(\' || \' ) }}',
+                rolling_window_expr_timestamp_cast: '{{ value }}'
             },
             tesseract: {
-                ilike: '{{ expr }} {% if negated %}NOT {% endif %}ILIKE {{ pattern }}', // May require different overloads in Tesseract than the ilike from expressions used in SQLAPI.
+                ilike: '{{ expr }} {% if negated %}NOT {% endif %}ILIKE {{ pattern }}',
+                series_bounds_cast: '{{ expr }}'
             },
             filters: {
                 equals: '{{ column }} = {{ value }}{{ is_null_check }}',