@cubejs-backend/schema-compiler 1.3.83 → 1.3.85

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

@@ -20,6 +20,16 @@ export declare class OracleQuery extends BaseQuery {
     timeStampCast(value: any): string;
     timeStampParam(timeDimension: any): string;
     timeGroupedColumn(granularity: any, dimension: any): any;
+    /**
+     * Oracle uses ADD_MONTHS for year/month/quarter intervals
+     * and NUMTODSINTERVAL for day/hour/minute/second intervals
+     */
+    addInterval(date: string, interval: string): string;
+    /**
+     * Oracle subtraction uses ADD_MONTHS with negative values
+     * and subtracts NUMTODSINTERVAL for time units
+     */
+    subtractInterval(date: string, interval: string): string;
     newFilter(filter: any): any;
     unixTimestampSql(): string;
     preAggregationTableName(cube: any, preAggregationName: any, skipSchema: any): string;

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

@@ -1 +1 @@
-{"version":3,"file":"OracleQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/OracleQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AA8BxC,qBAAa,WAAY,SAAQ,SAAS;IACxC;;;OAGG;IACI,qBAAqB;IAM5B;;OAEG;IACH,IAAW,aAAa,WAEvB;IAED,IAAW,YAAY,WAEtB;IAED;;;OAGG;IACI,aAAa;IASb,SAAS,CAAC,KAAK,KAAA;IAOf,YAAY,CAAC,KAAK,KAAA;IAMlB,aAAa,CAAC,KAAK,KAAA;IAKnB,cAAc,CAAC,aAAa,KAAA;IAI5B,iBAAiB,CAAC,WAAW,KAAA,EAAE,SAAS,KAAA;IAOxC,SAAS,CAAC,MAAM,KAAA;IAIhB,gBAAgB;IAKhB,uBAAuB,CAAC,IAAI,KAAA,EAAE,kBAAkB,KAAA,EAAE,UAAU,KAAA;CAOpE"}
+{"version":3,"file":"OracleQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/OracleQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AA8BxC,qBAAa,WAAY,SAAQ,SAAS;IACxC;;;OAGG;IACI,qBAAqB;IAM5B;;OAEG;IACH,IAAW,aAAa,WAEvB;IAED,IAAW,YAAY,WAEtB;IAED;;;OAGG;IACI,aAAa;IAab,SAAS,CAAC,KAAK,KAAA;IAOf,YAAY,CAAC,KAAK,KAAA;IAMlB,aAAa,CAAC,KAAK,KAAA;IAKnB,cAAc,CAAC,aAAa,KAAA;IAI5B,iBAAiB,CAAC,WAAW,KAAA,EAAE,SAAS,KAAA;IAO/C;;;OAGG;IACI,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAqC1D;;;OAGG;IACI,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAqCxD,SAAS,CAAC,MAAM,KAAA;IAIhB,gBAAgB;IAKhB,uBAAuB,CAAC,IAAI,KAAA,EAAE,kBAAkB,KAAA,EAAE,UAAU,KAAA;CAOpE"}

package/dist/src/adapter/OracleQuery.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OracleQuery = void 0;
+const shared_1 = require("@cubejs-backend/shared");
 const BaseQuery_1 = require("./BaseQuery");
 const BaseFilter_1 = require("./BaseFilter");
 const UserError_1 = require("../compiler/UserError");
@@ -50,7 +51,9 @@ class OracleQuery extends BaseQuery_1.BaseQuery {
      * using forSelect dimensions for grouping
      */
     groupByClause() {
-        const dimensions = this.forSelect().filter((item) => !!item.dimension);
+        // Only include dimensions that have select columns
+        // Time dimensions without granularity return null from selectColumns()
+        const dimensions = this.forSelect().filter((item) => (!!item.dimension && item.selectColumns && item.selectColumns()));
         if (!dimensions.length) {
             return '';
         }
@@ -80,6 +83,78 @@ class OracleQuery extends BaseQuery_1.BaseQuery {
         }
         return `TRUNC(${dimension}, '${GRANULARITY_VALUE[granularity]}')`;
     }
+    /**
+     * Oracle uses ADD_MONTHS for year/month/quarter intervals
+     * and NUMTODSINTERVAL for day/hour/minute/second intervals
+     */
+    addInterval(date, interval) {
+        const intervalParsed = (0, shared_1.parseSqlInterval)(interval);
+        let res = date;
+        // Handle year/month/quarter using ADD_MONTHS
+        let totalMonths = 0;
+        if (intervalParsed.year) {
+            totalMonths += intervalParsed.year * 12;
+        }
+        if (intervalParsed.quarter) {
+            totalMonths += intervalParsed.quarter * 3;
+        }
+        if (intervalParsed.month) {
+            totalMonths += intervalParsed.month;
+        }
+        if (totalMonths !== 0) {
+            res = `ADD_MONTHS(${res}, ${totalMonths})`;
+        }
+        // Handle day/hour/minute/second using NUMTODSINTERVAL
+        if (intervalParsed.day) {
+            res = `${res} + NUMTODSINTERVAL(${intervalParsed.day}, 'DAY')`;
+        }
+        if (intervalParsed.hour) {
+            res = `${res} + NUMTODSINTERVAL(${intervalParsed.hour}, 'HOUR')`;
+        }
+        if (intervalParsed.minute) {
+            res = `${res} + NUMTODSINTERVAL(${intervalParsed.minute}, 'MINUTE')`;
+        }
+        if (intervalParsed.second) {
+            res = `${res} + NUMTODSINTERVAL(${intervalParsed.second}, 'SECOND')`;
+        }
+        return res;
+    }
+    /**
+     * Oracle subtraction uses ADD_MONTHS with negative values
+     * and subtracts NUMTODSINTERVAL for time units
+     */
+    subtractInterval(date, interval) {
+        const intervalParsed = (0, shared_1.parseSqlInterval)(interval);
+        let res = date;
+        // Handle year/month/quarter using ADD_MONTHS with negative values
+        let totalMonths = 0;
+        if (intervalParsed.year) {
+            totalMonths += intervalParsed.year * 12;
+        }
+        if (intervalParsed.quarter) {
+            totalMonths += intervalParsed.quarter * 3;
+        }
+        if (intervalParsed.month) {
+            totalMonths += intervalParsed.month;
+        }
+        if (totalMonths !== 0) {
+            res = `ADD_MONTHS(${res}, -${totalMonths})`;
+        }
+        // Handle day/hour/minute/second using NUMTODSINTERVAL with subtraction
+        if (intervalParsed.day) {
+            res = `${res} - NUMTODSINTERVAL(${intervalParsed.day}, 'DAY')`;
+        }
+        if (intervalParsed.hour) {
+            res = `${res} - NUMTODSINTERVAL(${intervalParsed.hour}, 'HOUR')`;
+        }
+        if (intervalParsed.minute) {
+            res = `${res} - NUMTODSINTERVAL(${intervalParsed.minute}, 'MINUTE')`;
+        }
+        if (intervalParsed.second) {
+            res = `${res} - NUMTODSINTERVAL(${intervalParsed.second}, 'SECOND')`;
+        }
+        return res;
+    }
     newFilter(filter) {
         return new OracleFilter(this, filter);
     }

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

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

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

@@ -1,4 +1,5 @@
 import { PreAggregationDefinition } from '../compiler/CubeSymbols';
+import { JoinEdge } from '../compiler/JoinGraph';
 import { BaseQuery } from './BaseQuery';
 import { PreAggregationReferences, PreAggregationTimeDimensionReference } from '../compiler/CubeEvaluator';
 import { BaseTimeDimension } from './BaseTimeDimension';
@@ -7,7 +8,6 @@ import { BaseFilter } from './BaseFilter';
 import { BaseGroupFilter } from './BaseGroupFilter';
 import { BaseDimension } from './BaseDimension';
 import { BaseSegment } from './BaseSegment';
-export type RollupJoin = any;
 export type PartitionTimeDimension = {
     dimension: string;
     dateRange: [string, string];
@@ -50,6 +50,15 @@ export type EvaluateReferencesContext = {
     inPreAggEvaluation?: boolean;
 };
 export type BaseMember = BaseDimension | BaseMeasure | BaseFilter | BaseGroupFilter | BaseSegment;
+export type JoinEdgeWithMembers = JoinEdge & {
+    fromMembers: string[];
+    toMembers: string[];
+};
+export type RollupJoinItem = JoinEdgeWithMembers & {
+    fromPreAggObj: PreAggregationForQuery;
+    toPreAggObj: PreAggregationForQuery;
+};
+export type RollupJoin = RollupJoinItem[];
 export type CanUsePreAggregationFn = (references: PreAggregationReferences) => boolean;
 /**
  * TODO: Write a real type.
@@ -120,10 +129,11 @@ export declare class PreAggregations {
     private rollupMatchResults;
     private findRollupPreAggregationsForCube;
     getRollupPreAggregationByName(cube: any, preAggregationName: any): PreAggregationForQueryWithTableName | {};
+    private collectJoinHintsFromRollupReferences;
     private buildRollupJoin;
     private preAggObjForJoin;
     private resolveJoinMembers;
-    private cubesFromPreAggregation;
+    private cubesHintsFromPreAggregation;
     private evaluatedPreAggregationObj;
     static checkPartitionGranularityDefined(cube: string, preAggregationName: string, preAggregation: PreAggregationForQuery): string;
     static memberNameMismatchValidation(preAggA: PreAggregationForQuery, preAggB: PreAggregationForQuery, memberType: 'measures' | 'dimensions' | 'timeDimensions'): void;
@@ -147,6 +157,9 @@ export declare class PreAggregations {
     autoRollupPreAggregationQuery(cube: string, aggregation: PreAggregationDefinitionExtended): BaseQuery;
     private mergePartitionTimeDimensions;
     private autoRollupNameSuffix;
+    private enrichMembersCubeJoinPath;
+    private buildMembersFullName;
+    private buildTimeDimensionsFullName;
     private evaluateAllReferences;
     originalSqlPreAggregationTable(preAggregationDescription: PreAggregationForCube): string;
     private rollupLambdaUnion;

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

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

package/dist/src/adapter/PreAggregations.js

@@ -63,7 +63,7 @@ class PreAggregations {
         if (foundPreAggregation.preAggregation.type === 'rollupJoin') {
             preAggregations = foundPreAggregation.preAggregationsToJoin || [];
         }
-        if (foundPreAggregation.preAggregation.type === 'rollupLambda') {
+        else if (foundPreAggregation.preAggregation.type === 'rollupLambda') {
             preAggregations = foundPreAggregation.referencedPreAggregations || [];
         }
         return preAggregations.map(preAggregation => {
@@ -425,10 +425,10 @@ class PreAggregations {
          * Determine whether pre-aggregation can be used or not.
          */
         const canUsePreAggregationNotAdditive = (references) => {
-            const refTimeDimensions = backAlias(sortTimeDimensions(references.timeDimensions));
             const qryTimeDimensions = references.allowNonStrictDateRangeMatch
                 ? transformedQuery.timeDimensions
                 : transformedQuery.sortedTimeDimensions;
+            const refTimeDimensions = backAlias(sortTimeDimensions(references.timeDimensions));
             const backAliasMeasures = backAlias(references.measures);
             const backAliasDimensions = backAlias(references.dimensions);
             return ((transformedQuery.hasNoTimeDimensionsWithoutGranularity) && (!transformedQuery.hasCumulativeMeasures) && (ramda_1.default.equals(qryTimeDimensions, refTimeDimensions)) && (transformedQuery.isAdditive ||
@@ -436,9 +436,9 @@ class PreAggregations {
                 references.dimensions.length === filterDimensionsSingleValueEqual.size &&
                 ramda_1.default.all(d => filterDimensionsSingleValueEqual.has(d), backAliasDimensions) ||
                 transformedQuery.allFiltersWithinSelectedDimensions &&
-                    ramda_1.default.equals(backAliasDimensions, transformedQuery.sortedDimensions)) && (ramda_1.default.all(m => backAliasMeasures.indexOf(m) !== -1, transformedQuery.measures) ||
+                    ramda_1.default.equals(backAliasDimensions, transformedQuery.sortedDimensions)) && (ramda_1.default.all(m => backAliasMeasures.includes(m), transformedQuery.measures) ||
                 // TODO do we need backAlias here?
-                ramda_1.default.all(m => backAliasMeasures.indexOf(m) !== -1, transformedQuery.leafMeasures)));
+                ramda_1.default.all(m => backAliasMeasures.includes(m), transformedQuery.leafMeasures)));
         };
         /**
          * Expand granularity into array of granularity hierarchy.
@@ -491,15 +491,10 @@ class PreAggregations {
                     return false;
                 }
             }
-            // In 'rollupJoin' / 'rollupLambda' pre-aggregations fullName members will be empty, because there are
-            // no connections in the joinTree between cubes from different datasources
-            const dimsToMatch = references.rollups.length > 0 ? references.dimensions : references.fullNameDimensions;
-            const dimensionsMatch = (dimensions, doBackAlias) => ramda_1.default.all(d => (doBackAlias ?
-                backAlias(dimsToMatch) :
-                (dimsToMatch)).indexOf(d) !== -1, dimensions);
-            // In 'rollupJoin' / 'rollupLambda' pre-aggregations fullName members will be empty, because there are
-            // no connections in the joinTree between cubes from different datasources
-            const timeDimsToMatch = references.rollups.length > 0 ? references.timeDimensions : references.fullNameTimeDimensions;
+            const dimensionsMatch = (dimensions, doBackAlias) => {
+                const target = doBackAlias ? backAlias(references.dimensions) : references.dimensions;
+                return dimensions.every(d => target.includes(d));
+            };
             const timeDimensionsMatch = (timeDimensionsList, doBackAlias) => ramda_1.default.allPass(timeDimensionsList.map(tds => ramda_1.default.anyPass(tds.map((td) => {
                 if (td[1] === '*') {
                     return ramda_1.default.any((tdtc) => tdtc[0] === td[0]); // need to match the dimension at least
@@ -508,8 +503,8 @@ class PreAggregations {
                     return ramda_1.default.includes(td);
                 }
             }))))(doBackAlias ?
-                backAlias(sortTimeDimensions(timeDimsToMatch)) :
-                (sortTimeDimensions(timeDimsToMatch)));
+                backAlias(sortTimeDimensions(references.timeDimensions)) :
+                (sortTimeDimensions(references.timeDimensions)));
             if (transformedQuery.ungrouped) {
                 const allReferenceCubes = ramda_1.default.pipe(ramda_1.default.map((name) => name?.split('.')[0]), ramda_1.default.uniq, ramda_1.default.sortBy(ramda_1.default.identity))([
                     ...references.measures.map(m => CubeSymbols_1.CubeSymbols.joinHintFromPath(m).path),
@@ -634,15 +629,30 @@ class PreAggregations {
             return {};
         }
     }
+    collectJoinHintsFromRollupReferences(refs) {
+        if (!refs.joinTree) {
+            return [];
+        }
+        const hints = [refs.joinTree.root];
+        for (const j of refs.joinTree.joins) {
+            hints.push([j.from, j.to]);
+        }
+        return hints;
+    }
     // TODO check multiplication factor didn't change
     buildRollupJoin(preAggObj, preAggObjsToJoin) {
         return this.query.cacheValue(['buildRollupJoin', JSON.stringify(preAggObj), JSON.stringify(preAggObjsToJoin)], () => {
-            const targetJoins = this.resolveJoinMembers(
-            // TODO join hints?
-            this.query.joinGraph.buildJoin(this.cubesFromPreAggregation(preAggObj)));
-            const existingJoins = ramda_1.default.unnest(preAggObjsToJoin.map(
+            // It's not enough to call buildJoin() directly on cubesFromPreAggregation()
+            // because transitive joins won't be collected in that case.
+            const builtJoinTree = this.query.joinTreeForHints(this.cubesHintsFromPreAggregation(preAggObj), true);
+            if (!builtJoinTree) {
+                throw new UserError_1.UserError(`Can't build join tree for pre-aggregation ${preAggObj.cube}.${preAggObj.preAggregationName}`);
+            }
+            const targetJoins = this.resolveJoinMembers(builtJoinTree);
             // TODO join hints?
-            p => this.resolveJoinMembers(this.query.joinGraph.buildJoin(this.cubesFromPreAggregation(p)))));
+            const existingJoins = preAggObjsToJoin
+                .map(p => this.resolveJoinMembers(this.query.joinTreeForHints(this.cubesHintsFromPreAggregation(p), true)))
+                .flat();
             const nonExistingJoins = targetJoins.filter(target => !existingJoins.find(existing => existing.originalFrom === target.originalFrom &&
                 existing.originalTo === target.originalTo &&
                 ramda_1.default.equals(existing.fromMembers, target.fromMembers) &&
@@ -651,8 +661,8 @@ class PreAggregations {
                 throw new UserError_1.UserError(`Nothing to join in rollup join. Target joins ${JSON.stringify(targetJoins)} are included in existing rollup joins ${JSON.stringify(existingJoins)}`);
             }
             return nonExistingJoins.map(join => {
-                const fromPreAggObj = this.preAggObjForJoin(preAggObjsToJoin, join.fromMembers, join);
-                const toPreAggObj = this.preAggObjForJoin(preAggObjsToJoin, join.toMembers, join);
+                const fromPreAggObj = this.preAggObjForJoin(preAggObjsToJoin, join.fromMembers, join, `${preAggObj.cube}.${preAggObj.preAggregationName}`);
+                const toPreAggObj = this.preAggObjForJoin(preAggObjsToJoin, join.toMembers, join, `${preAggObj.cube}.${preAggObj.preAggregationName}`);
                 return {
                     ...join,
                     fromPreAggObj,
@@ -661,11 +671,12 @@ class PreAggregations {
             });
         });
     }
-    preAggObjForJoin(preAggObjsToJoin, joinMembers, join) {
+    preAggObjForJoin(preAggObjsToJoin, joinMembers, join, rollupJoinPreAggName) {
         const fromPreAggObj = preAggObjsToJoin
             .filter(p => joinMembers.every(m => !!p.references.dimensions.find(d => m === d)));
         if (!fromPreAggObj.length) {
-            throw new UserError_1.UserError(`No rollups found that can be used for rollup join: ${JSON.stringify(join)}`);
+            const msg = `No rollups found that can be used for a rollup join from "${join.from}" (fromMembers: ${JSON.stringify(join.fromMembers)}) to "${join.to}" (toMembers: ${JSON.stringify(join.toMembers)}). Check the "${rollupJoinPreAggName}" pre-aggregation definition — you may have forgotten to specify the full dimension paths`;
+            throw new UserError_1.UserError(msg);
         }
         if (fromPreAggObj.length > 1) {
             throw new UserError_1.UserError(`Multiple rollups found that can be used for rollup join ${JSON.stringify(join)}: ${fromPreAggObj.map(p => this.preAggregationId(p)).join(', ')}`);
@@ -673,13 +684,15 @@ class PreAggregations {
         return fromPreAggObj[0];
     }
     resolveJoinMembers(join) {
+        const joinMap = new Set();
         return join.joins.map(j => {
+            joinMap.add(j.originalFrom);
             const memberPaths = this.query.collectMemberNamesFor(() => this.query.evaluateSql(j.originalFrom, j.join.sql)).map(m => m.split('.'));
-            const invalidMembers = memberPaths.filter(m => m[0] !== j.originalFrom && m[0] !== j.originalTo);
+            const invalidMembers = memberPaths.filter(m => !joinMap.has(m[0]) && m[0] !== j.originalTo);
             if (invalidMembers.length) {
                 throw new UserError_1.UserError(`Members ${invalidMembers.join(', ')} in join from '${j.originalFrom}' to '${j.originalTo}' doesn't reference join cubes`);
             }
-            const fromMembers = memberPaths.filter(m => m[0] === j.originalFrom).map(m => m.join('.'));
+            const fromMembers = memberPaths.filter(m => joinMap.has(m[0])).map(m => m.join('.'));
             if (!fromMembers.length) {
                 throw new UserError_1.UserError(`From members are not found in [${memberPaths.map(m => m.join('.')).join(', ')}] for join ${JSON.stringify(j)}. Please make sure join fields are referencing dimensions instead of columns.`);
             }
@@ -687,6 +700,7 @@ class PreAggregations {
             if (!toMembers.length) {
                 throw new UserError_1.UserError(`To members are not found in [${memberPaths.map(m => m.join('.')).join(', ')}] for join ${JSON.stringify(j)}. Please make sure join fields are referencing dimensions instead of columns.`);
             }
+            joinMap.add(j.originalTo);
             return {
                 ...j,
                 fromMembers,
@@ -694,8 +708,8 @@ class PreAggregations {
             };
         });
     }
-    cubesFromPreAggregation(preAggObj) {
-        return ramda_1.default.uniq(preAggObj.references.measures.map(m => this.query.cubeEvaluator.parsePath('measures', m)).concat(preAggObj.references.dimensions.map(m => this.query.cubeEvaluator.parsePathAnyType(m))).map(p => p[0]));
+    cubesHintsFromPreAggregation(preAggObj) {
+        return ramda_1.default.uniq(preAggObj.references.measures.concat(preAggObj.references.dimensions).map(p => p.split('.').slice(0, -1)));
     }
     evaluatedPreAggregationObj(cube, preAggregationName, preAggregation, canUsePreAggregation) {
         const references = this.evaluateAllReferences(cube, preAggregation, preAggregationName);
@@ -703,7 +717,9 @@ class PreAggregations {
             preAggregationName,
             preAggregation,
             cube,
-            canUsePreAggregation: canUsePreAggregation(references),
+            // For rollupJoin and rollupLambda we need to enrich references with data
+            // from the underlying rollups which are collected later;
+            canUsePreAggregation: preAggregation.type === 'rollup' ? canUsePreAggregation(references) : false,
             references,
             preAggregationId: `${cube}.${preAggregationName}`
         };
@@ -713,10 +729,15 @@ class PreAggregations {
                 const [joinCube, joinPreAggregationName] = this.query.cubeEvaluator.parsePath('preAggregations', name);
                 return this.evaluatedPreAggregationObj(joinCube, joinPreAggregationName, this.query.cubeEvaluator.byPath('preAggregations', name), canUsePreAggregation);
             });
+            preAggregationsToJoin.forEach(preAgg => {
+                references.rollupsReferences.push(preAgg.references);
+            });
+            const rollupJoin = this.buildRollupJoin(preAggObj, preAggregationsToJoin);
             return {
                 ...preAggObj,
+                canUsePreAggregation: canUsePreAggregation(references),
                 preAggregationsToJoin,
-                rollupJoin: this.buildRollupJoin(preAggObj, preAggregationsToJoin)
+                rollupJoin,
             };
         }
         else if (preAggregation.type === 'rollupLambda') {
@@ -755,8 +776,12 @@ class PreAggregations {
                 PreAggregations.memberNameMismatchValidation(preAggObj, referencedPreAggregation, 'dimensions');
                 PreAggregations.memberNameMismatchValidation(preAggObj, referencedPreAggregation, 'timeDimensions');
             });
+            referencedPreAggregations.forEach(preAgg => {
+                references.rollupsReferences.push(preAgg.references);
+            });
             return {
                 ...preAggObj,
+                canUsePreAggregation: canUsePreAggregation(references),
                 referencedPreAggregations,
             };
         }
@@ -783,7 +808,7 @@ class PreAggregations {
                 return `${member.dimension.split('.')[1]}.${member.granularity}`;
             }
             else {
-                return member.split('.')[1];
+                return member.split('.').at(-1);
             }
         });
     }
@@ -841,11 +866,9 @@ class PreAggregations {
             preAggregationQuery: true,
             useOriginalSqlPreAggregationsInPreAggregation: aggregation.useOriginalSqlPreAggregations,
             ungrouped: cubeQuery.preAggregationAllowUngroupingWithPrimaryKey(cube, aggregation) &&
-                !!references.dimensions.find((d) => {
-                    // `d` can contain full join path, so we should trim it
-                    const trimmedDimension = CubeSymbols_1.CubeSymbols.joinHintFromPath(d).path;
-                    return this.query.cubeEvaluator.dimensionByPath(trimmedDimension).primaryKey;
-                }),
+                references.dimensions.some((d) => this.query.cubeEvaluator.dimensionByPath(
+                // `d` can contain full join path, so we should trim it
+                this.query.cubeEvaluator.memberShortNameFromPath(d)).primaryKey),
         });
     }
     autoRollupPreAggregationQuery(cube, aggregation) {
@@ -879,6 +902,32 @@ class PreAggregations {
             .replace(/[.]/g, '')
             .toLowerCase();
     }
+    enrichMembersCubeJoinPath(cubeName, joinsMap) {
+        const path = [cubeName];
+        const parentMap = joinsMap;
+        while (parentMap[cubeName]) {
+            cubeName = parentMap[cubeName];
+            path.push(cubeName);
+        }
+        return path.reverse();
+    }
+    buildMembersFullName(members, joinsMap) {
+        return members.map(d => {
+            const [cubeName, ...restPath] = d.split('.');
+            const path = this.enrichMembersCubeJoinPath(cubeName, joinsMap);
+            return `${path.join('.')}.${restPath.join('.')}`;
+        });
+    }
+    buildTimeDimensionsFullName(members, joinsMap) {
+        return members.map(td => {
+            const [cubeName, ...restPath] = td.dimension.split('.');
+            const path = this.enrichMembersCubeJoinPath(cubeName, joinsMap);
+            return {
+                ...td,
+                dimension: `${path.join('.')}.${restPath.join('.')}`,
+            };
+        });
+    }
     evaluateAllReferences(cube, aggregation, preAggregationName = null, context = {}) {
         const evaluateReferences = () => {
             const references = this.query.cubeEvaluator.evaluatePreAggregationReferences(cube, aggregation);
@@ -889,18 +938,17 @@ class PreAggregations {
                 if (preAggQuery) {
                     // We need to build a join tree for all references, so they would always include full join path
                     // even for preaggregation references without join path. It is necessary to be able to match
-                    // query and preaggregation based on full join tree. But we can not update
-                    // references.{dimensions,measures,timeDimensions} directly, because it will break
-                    // evaluation of references in the query on later stages.
-                    // So we store full named members separately and use them in canUsePreAggregation functions.
+                    // query and preaggregation based on full join tree.
                     references.joinTree = preAggQuery.join;
-                    const root = references.joinTree?.root || '';
-                    references.fullNameMeasures = references.measures.map(m => (m.startsWith(root) ? m : `${root}.${m}`));
-                    references.fullNameDimensions = references.dimensions.map(d => (d.startsWith(root) ? d : `${root}.${d}`));
-                    references.fullNameTimeDimensions = references.timeDimensions.map(d => ({
-                        dimension: (d.dimension.startsWith(root) ? d.dimension : `${root}.${d.dimension}`),
-                        granularity: d.granularity,
-                    }));
+                    const joinsMap = {};
+                    if (references.joinTree) {
+                        for (const j of references.joinTree.joins) {
+                            joinsMap[j.to] = j.from;
+                        }
+                    }
+                    references.dimensions = this.buildMembersFullName(references.dimensions, joinsMap);
+                    references.measures = this.buildMembersFullName(references.measures, joinsMap);
+                    references.timeDimensions = this.buildTimeDimensionsFullName(references.timeDimensions, joinsMap);
                 }
             }
             if (aggregation.type === 'rollupLambda') {
@@ -923,7 +971,11 @@ class PreAggregations {
         if (!preAggregationName) {
             return evaluateReferences();
         }
-        return this.query.cacheValue(['evaluateAllReferences', cube, preAggregationName], evaluateReferences);
+        // Using [cube, preAggregationName] alone as cache keys isn’t reliable,
+        // as different queries can build distinct join graphs during pre-aggregation matching.
+        // Because the matching logic compares join subgraphs — particularly for 'rollupJoin' and 'rollupLambda'
+        // pre-aggregations — relying on such keys may cause incorrect results.
+        return this.query.cacheValue(['evaluateAllReferences', cube, preAggregationName, JSON.stringify(this.query.join)], evaluateReferences);
     }
     originalSqlPreAggregationTable(preAggregationDescription) {
         // eslint-disable-next-line prefer-const
@@ -1095,7 +1147,6 @@ class PreAggregations {
     }
     rollupMembers(preAggregationForQuery, type) {
         return preAggregationForQuery.preAggregation.type === 'autoRollup' ?
-            // TODO proper types
             preAggregationForQuery.preAggregation[type] :
             this.evaluateAllReferences(preAggregationForQuery.cube, preAggregationForQuery.preAggregation, preAggregationForQuery.preAggregationName)[type];
     }