@cubejs-backend/schema-compiler 0.29.35 → 0.29.48

package/CHANGELOG.md

@@ -3,6 +3,40 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.29.48](https://github.com/cube-js/cube.js/compare/v0.29.47...v0.29.48) (2022-04-14)
+
+
+### Features
+
+* **query-language:** "total" flag support ([#4134](https://github.com/cube-js/cube.js/issues/4134)) ([51aef5e](https://github.com/cube-js/cube.js/commit/51aef5ede6e9b0c0e0e8749119e98102f168b8ca))
+* Support Compound Primary Keys ([#4370](https://github.com/cube-js/cube.js/issues/4370)) Thanks [@rccoe](https://github.com/rccoe)! ([0e3983c](https://github.com/cube-js/cube.js/commit/0e3983ccb30a3f6815ba5ee28aa09807e55fd2a3)), closes [#4364](https://github.com/cube-js/cube.js/issues/4364)
+
+
+
+
+
+## [0.29.42](https://github.com/cube-js/cube.js/compare/v0.29.41...v0.29.42) (2022-04-04)
+
+
+### Bug Fixes
+
+* **playground:** rollup designer count distinct warning ([#4309](https://github.com/cube-js/cube.js/issues/4309)) ([add2dd3](https://github.com/cube-js/cube.js/commit/add2dd3106f7fd9deb3ea88fa74467ccd1b9244f))
+
+
+
+
+
+## [0.29.37](https://github.com/cube-js/cube.js/compare/v0.29.36...v0.29.37) (2022-03-29)
+
+
+### Features
+
+* **@cubejs-backend/schema-compiler:** Allow filtering with or/and in FILTER_PARAMS ([#4253](https://github.com/cube-js/cube.js/issues/4253)) Thanks [@tchell](https://github.com/tchell)! ([cb1446c](https://github.com/cube-js/cube.js/commit/cb1446c4e788bcb43bdc90fc0a48ffc49fd0d891))
+
+
+
+
+
 ## [0.29.35](https://github.com/cube-js/cube.js/compare/v0.29.34...v0.29.35) (2022-03-24)
 
 **Note:** Version bump only for package @cubejs-backend/schema-compiler

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

@@ -1 +1 @@
-{"version":3,"file":"AWSElasticSearchQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/AWSElasticSearchQuery.js"],"names":[],"mappings":"AAqBA;IA6DiD,0CAmBgC;IA1B/E,4BAoBC;CAKF"}
+{"version":3,"file":"AWSElasticSearchQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/AWSElasticSearchQuery.js"],"names":[],"mappings":"AAqBA;IA6D6D,0CAmBgC;IA1B3F,4BAoBC;CAKF"}

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

@@ -4,7 +4,9 @@ export class BaseGroupFilter {
     operator: any;
     measure: any;
     dimension: any;
+    conditionSql(column: any): string;
     filterToWhere(): any;
+    filterParams(): any;
     getMembers(): any;
 }
 //# sourceMappingURL=BaseGroupFilter.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"BaseGroupFilter.d.ts","sourceRoot":"","sources":["../../../src/adapter/BaseGroupFilter.js"],"names":[],"mappings":"AAEA;IACE,qCAKC;IAJC,YAA2B;IAC3B,cAA+B;IAC/B,aAA6B;IAC7B,eAAiC;IAGnC,qBAaC;IAED,kBAOC;CACF"}
+{"version":3,"file":"BaseGroupFilter.d.ts","sourceRoot":"","sources":["../../../src/adapter/BaseGroupFilter.js"],"names":[],"mappings":"AAEA;IACE,qCAKC;IAJC,YAA2B;IAC3B,cAA+B;IAC/B,aAA6B;IAC7B,eAAiC;IAGnC,kCAEC;IAED,qBAaC;IAED,oBAEC;IAED,kBAOC;CACF"}

package/dist/src/adapter/BaseGroupFilter.js

@@ -12,6 +12,9 @@ class BaseGroupFilter {
         this.measure = filter.measure;
         this.dimension = filter.dimension;
     }
+    conditionSql(column) {
+        return `(\n${this.values.map(f => f.conditionSql(column)).join(` ${this.operator.toUpperCase()} `)}\n)`;
+    }
     filterToWhere() {
         const r = this.values.map(f => {
             const sql = f.filterToWhere();
@@ -25,6 +28,9 @@ class BaseGroupFilter {
         }
         return r;
     }
+    filterParams() {
+        return this.values.map(f => f.filterParams());
+    }
     getMembers() {
         return this.values.map(f => {
             if (f.getMembers) {

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

@@ -1 +1 @@
-{"version":3,"file":"BaseGroupFilter.js","sourceRoot":"","sources":["../../../src/adapter/BaseGroupFilter.js"],"names":[],"mappings":";;;;;;AAAA,kDAAsB;AAEtB,MAAa,eAAe;IAC1B,YAAY,KAAK,EAAE,MAAM;QACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC5B,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;QAChC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC9B,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;IACpC,CAAC;IAED,aAAa;QACX,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YAC5B,MAAM,GAAG,GAAG,CAAC,CAAC,aAAa,EAAE,CAAC;YAC9B,IAAI,CAAC,GAAG,EAAE;gBACR,OAAO,IAAI,CAAC;aACb;YACD,OAAO,IAAI,GAAG,GAAG,CAAC;QACpB,CAAC,CAAC,CAAC,MAAM,CAAC,eAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;QAEjD,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE;YACb,OAAO,IAAI,CAAC;SACb;QACD,OAAO,CAAC,CAAC;IACX,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YACzB,IAAI,CAAC,CAAC,UAAU,EAAE;gBAChB,OAAO,CAAC,CAAC,UAAU,EAAE,CAAC;aACvB;YACD,OAAO,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AA/BD,0CA+BC"}
+{"version":3,"file":"BaseGroupFilter.js","sourceRoot":"","sources":["../../../src/adapter/BaseGroupFilter.js"],"names":[],"mappings":";;;;;;AAAA,kDAAsB;AAEtB,MAAa,eAAe;IAC1B,YAAY,KAAK,EAAE,MAAM;QACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC5B,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;QAChC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC9B,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;IACpC,CAAC;IAED,YAAY,CAAC,MAAM;QACjB,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,KAAK,CAAC;IAC1G,CAAC;IAED,aAAa;QACX,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YAC5B,MAAM,GAAG,GAAG,CAAC,CAAC,aAAa,EAAE,CAAC;YAC9B,IAAI,CAAC,GAAG,EAAE;gBACR,OAAO,IAAI,CAAC;aACb;YACD,OAAO,IAAI,GAAG,GAAG,CAAC;QACpB,CAAC,CAAC,CAAC,MAAM,CAAC,eAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;QAEjD,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE;YACb,OAAO,IAAI,CAAC;SACb;QACD,OAAO,CAAC,CAAC;IACX,CAAC;IAED,YAAY;QACV,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YACzB,IAAI,CAAC,CAAC,UAAU,EAAE;gBAChB,OAAO,CAAC,CAAC,UAAU,EAAE,CAAC;aACvB;YACD,OAAO,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAvCD,0CAuCC"}

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

@@ -79,11 +79,29 @@ export class BaseQuery {
     newTimeDimension(timeDimension: any): BaseTimeDimension;
     newParamAllocator(): ParamAllocator;
     newPreAggregations(): PreAggregations;
+    /**
+     * Wrap cpecified column with the double quote.
+     */
     escapeColumnName(name: any): string;
-    buildParamAnnotatedSql(): any;
+    /**
+     * Returns SQL query string.
+     * @returns {string}
+     */
+    buildParamAnnotatedSql(): string;
+    /**
+     * Generate SQL query to calculate total number of rows of the
+     * specified SQL query.
+     * @param {string} sql
+     * @returns {string}
+     */
+    countAllQuery(sql: string): string;
     regularAndTimeSeriesRollupQuery(regularMeasures: any, multipliedMeasures: any, cumulativeMeasures: any, preAggregationForQuery: any): string;
     externalPreAggregationQuery(): boolean;
-    buildSqlAndParams(): any;
+    /**
+     * Returns an array of SQL query strings for the query.
+     * @returns {Array<string>}
+     */
+    buildSqlAndParams(): Array<string>;
     externalQuery(): any;
     runningTotalDateJoinCondition(): any;
     rollingWindowDateJoinCondition(trailingInterval: any, leadingInterval: any, offset: any): any;
@@ -94,6 +112,10 @@ export class BaseQuery {
     cumulativeMeasures(): any;
     isRolling(): boolean;
     simpleQuery(): string;
+    /**
+     * Returns SQL query string.
+     * @returns {string}
+     */
     fullKeyQueryAggregate(): string;
     joinFullKeyQueryAggregate(multipliedMeasures: any, regularMeasures: any, cumulativeMeasures: any, toJoin: any): string;
     fullKeyQueryAggregateMeasures(): {
@@ -139,7 +161,7 @@ export class BaseQuery {
     subQueryJoin(dimension: any): {
         sql: string;
         alias: string;
-        on: string;
+        on: any;
     };
     get filtersWithoutSubQueries(): any;
     filtersWithoutSubQueriesValue: any;
@@ -152,12 +174,12 @@ export class BaseQuery {
     regularMeasuresSubQuery(measures: any, filters: any): string;
     aggregateSubQuery(keyCubeName: any, measures: any, filters: any): string;
     checkShouldBuildJoinForMeasureSelect(measures: any, keyCubeName: any): any;
-    aggregateSubQueryMeasureJoin(keyCubeName: any, measures: any, measuresJoin: any, primaryKeyDimension: any, measureSubQueryDimensions: any): any;
+    aggregateSubQueryMeasureJoin(keyCubeName: any, measures: any, measuresJoin: any, primaryKeyDimensions: any, measureSubQueryDimensions: any): any;
     groupedUngroupedSelect(select: any, ungrouped: any, granularityOverride: any): any;
     ungroupedMeasureSelect(select: any): any;
-    keysQuery(primaryKeyDimension: any, filters: any): string;
-    keysSelect(primaryKeyDimension: any): string;
-    keyDimensions(primaryKeyDimension: any): any;
+    keysQuery(primaryKeyDimensions: any, filters: any): string;
+    keysSelect(primaryKeyDimensions: any): string;
+    keyDimensions(primaryKeyDimensions: any): any[];
     cubeSql(cube: any): any;
     traverseSymbol(s: any): any;
     collectCubeNames(excludeTimeDimensions: any): any;
@@ -187,7 +209,8 @@ export class BaseQuery {
     evaluateSymbolSql(cubeName: any, name: any, symbol: any): any;
     autoPrefixAndEvaluateSql(cubeName: any, sql: any): any;
     concatStringsSql(strings: any): any;
-    primaryKeyName(cubeName: any): string;
+    primaryKeyNames(cubeName: any): any;
+    primaryKeyName(cubeName: any, primaryKey: any): string;
     evaluateSql(cubeName: any, sql: any, options: any): any;
     withCubeAliasPrefix(cubeAliasPrefix: any, fn: any): any;
     /**
@@ -211,6 +234,7 @@ export class BaseQuery {
     hllCardinality(sql: any): void;
     hllMergeOnly(sql: any): void;
     hllCardinalityMerge(sql: any): void;
+    castToString(sql: any): string;
     countDistinctApprox(sql: any): void;
     primaryKeyCount(cubeName: any, distinct: any): any;
     renderDimensionCase(symbol: any, cubeName: any): string;

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

@@ -275,7 +275,7 @@ class BaseQuery {
         if (this.ungrouped) {
             if (!this.options.allowUngroupedWithoutPrimaryKey) {
                 const cubes = ramda_1.default.uniq([this.join.root].concat(this.join.joins.map(j => j.originalTo)));
-                const primaryKeyNames = cubes.map(c => this.primaryKeyName(c));
+                const primaryKeyNames = cubes.flatMap(c => this.primaryKeyNames(c));
                 const missingPrimaryKeys = primaryKeyNames.filter(key => !this.dimensions.find(d => d.dimension === key));
                 if (missingPrimaryKeys.length) {
                     throw new UserError_1.UserError(`Ungrouped query requires primary keys to be present in dimensions: ${missingPrimaryKeys.map(k => `'${k}'`).join(', ')}. Pass allowUngroupedWithoutPrimaryKey option to disable this check.`);
@@ -363,27 +363,55 @@ class BaseQuery {
     newPreAggregations() {
         return new PreAggregations_1.PreAggregations(this, this.options.historyQueries || [], this.options.cubeLatticeCache);
     }
+    /**
+     * Wrap cpecified column with the double quote.
+     */
     escapeColumnName(name) {
         return `"${name}"`;
     }
+    /**
+     * Returns SQL query string.
+     * @returns {string}
+     */
     buildParamAnnotatedSql() {
+        let sql;
+        let preAggForQuery;
         if (!this.options.preAggregationQuery && !this.ungrouped) {
-            const preAggregationForQuery = this.preAggregations.findPreAggregationForQuery();
-            if (preAggregationForQuery) {
-                const { multipliedMeasures, regularMeasures, cumulativeMeasures } = this.fullKeyQueryAggregateMeasures();
-                if (!cumulativeMeasures.length) {
-                    return this.preAggregations.rollupPreAggregation(preAggregationForQuery, this.measures, true);
-                }
-                return this.regularAndTimeSeriesRollupQuery(regularMeasures, multipliedMeasures, cumulativeMeasures, preAggregationForQuery);
+            preAggForQuery =
+                this.preAggregations.findPreAggregationForQuery();
+        }
+        if (preAggForQuery) {
+            const { multipliedMeasures, regularMeasures, cumulativeMeasures, } = this.fullKeyQueryAggregateMeasures();
+            if (cumulativeMeasures.length === 0) {
+                sql = this.preAggregations.rollupPreAggregation(preAggForQuery, this.measures, true);
+            }
+            else {
+                sql = this.regularAndTimeSeriesRollupQuery(regularMeasures, multipliedMeasures, cumulativeMeasures, preAggForQuery);
             }
         }
-        return this.fullKeyQueryAggregate();
+        else {
+            sql = this.fullKeyQueryAggregate();
+        }
+        return this.options.totalQuery
+            ? this.countAllQuery(sql)
+            : sql;
+    }
+    /**
+     * Generate SQL query to calculate total number of rows of the
+     * specified SQL query.
+     * @param {string} sql
+     * @returns {string}
+     */
+    countAllQuery(sql) {
+        return `select count(*) ${this.escapeColumnName(shared_1.QueryAlias.TOTAL_COUNT)} from (\n${sql}\n) ${this.escapeColumnName(shared_1.QueryAlias.ORIGINAL_QUERY)}`;
     }
     regularAndTimeSeriesRollupQuery(regularMeasures, multipliedMeasures, cumulativeMeasures, preAggregationForQuery) {
         const regularAndMultiplied = regularMeasures.concat(multipliedMeasures);
         const toJoin = (regularAndMultiplied.length ? [
             this.withCubeAliasPrefix('main', () => this.preAggregations.rollupPreAggregation(preAggregationForQuery, regularAndMultiplied, false)),
-        ] : []).concat(ramda_1.default.map(([multiplied, measure]) => this.withCubeAliasPrefix(`${this.aliasName(measure.measure.replace('.', '_'))}_cumulative`, () => this.overTimeSeriesQuery((measures, filters) => this.preAggregations.rollupPreAggregation(preAggregationForQuery, measures, false, filters), measure, true)))(cumulativeMeasures));
+        ] : []).concat(ramda_1.default.map(
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        ([multiplied, measure]) => this.withCubeAliasPrefix(`${this.aliasName(measure.measure.replace('.', '_'))}_cumulative`, () => this.overTimeSeriesQuery((measures, filters) => this.preAggregations.rollupPreAggregation(preAggregationForQuery, measures, false, filters), measure, true)))(cumulativeMeasures));
         return this.joinFullKeyQueryAggregate(multipliedMeasures, regularMeasures, cumulativeMeasures, toJoin);
     }
     externalPreAggregationQuery() {
@@ -397,6 +425,10 @@ class BaseQuery {
         }
         return false;
     }
+    /**
+     * Returns an array of SQL query strings for the query.
+     * @returns {Array<string>}
+     */
     buildSqlAndParams() {
         if (!this.options.preAggregationQuery && this.externalQueryClass) {
             if (this.externalPreAggregationQuery()) { // TODO performance
@@ -415,6 +447,7 @@ class BaseQuery {
     runningTotalDateJoinCondition() {
         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}`
         ]);
     }
@@ -466,15 +499,23 @@ class BaseQuery {
             this.orderBy() +
             this.groupByDimensionLimit();
     }
+    /**
+     * Returns SQL query string.
+     * @returns {string}
+     */
     fullKeyQueryAggregate() {
-        const { multipliedMeasures, regularMeasures, cumulativeMeasures } = this.fullKeyQueryAggregateMeasures();
+        const { multipliedMeasures, regularMeasures, cumulativeMeasures, } = this.fullKeyQueryAggregateMeasures();
         if (!multipliedMeasures.length && !cumulativeMeasures.length) {
             return this.simpleQuery();
         }
         let toJoin;
         if (this.options.preAggregationQuery) {
-            const allRegular = regularMeasures.concat(cumulativeMeasures.map(([multiplied, measure]) => (multiplied ? null : measure)).filter(m => !!m));
-            const allMultiplied = multipliedMeasures.concat(cumulativeMeasures.map(([multiplied, measure]) => (multiplied ? measure : null)).filter(m => !!m));
+            const allRegular = regularMeasures.concat(cumulativeMeasures
+                .map(([multiplied, measure]) => (multiplied ? null : measure))
+                .filter(m => !!m));
+            const allMultiplied = multipliedMeasures.concat(cumulativeMeasures
+                .map(([multiplied, measure]) => (multiplied ? measure : null))
+                .filter(m => !!m));
             toJoin = (allRegular.length ? [
                 this.withCubeAliasPrefix('main', () => this.regularMeasuresSubQuery(allRegular))
             ] : [])
@@ -483,15 +524,16 @@ class BaseQuery {
         else {
             toJoin =
                 (regularMeasures.length ? [
-                    this.withCubeAliasPrefix('main', () => this.regularMeasuresSubQuery(regularMeasures))
+                    this.withCubeAliasPrefix('main', () => this.regularMeasuresSubQuery(regularMeasures)),
                 ] : [])
                     .concat(ramda_1.default.pipe(ramda_1.default.groupBy(m => m.cube().name), ramda_1.default.toPairs, ramda_1.default.map(([keyCubeName, measures]) => this
-                    .withCubeAliasPrefix(`${this.aliasName(keyCubeName)}_key`, () => this.aggregateSubQuery(keyCubeName, measures))))(multipliedMeasures)).concat(ramda_1.default.map(([multiplied, measure]) => this.withCubeAliasPrefix(`${this.aliasName(measure.measure.replace('.', '_'))}_cumulative`, () => this.overTimeSeriesQuery(multiplied ?
-                    (measures, filters) => this.aggregateSubQuery(measures[0].cube().name, measures, filters) :
-                    this.regularMeasuresSubQuery.bind(this), measure, false)))(cumulativeMeasures));
+                    .withCubeAliasPrefix(`${this.aliasName(keyCubeName)}_key`, () => this.aggregateSubQuery(keyCubeName, measures))))(multipliedMeasures)).concat(ramda_1.default.map(([multiplied, measure]) => this.withCubeAliasPrefix(`${this.aliasName(measure.measure.replace('.', '_'))}_cumulative`, () => this.overTimeSeriesQuery(multiplied
+                    ? (measures, filters) => this.aggregateSubQuery(measures[0].cube().name, measures, filters)
+                    : this.regularMeasuresSubQuery.bind(this), measure, false)))(cumulativeMeasures));
         }
-        // Move regular measures to multiplied ones if there're same cubes to calculate.
-        // Most of the times it'll be much faster to calculate as there will be only single scan per cube
+        // Move regular measures to multiplied ones if there're same
+        // cubes to calculate. Most of the times it'll be much faster to
+        // calculate as there will be only single scan per cube.
         if (regularMeasures.length &&
             multipliedMeasures.length &&
             !cumulativeMeasures.length) {
@@ -716,7 +758,7 @@ class BaseQuery {
     }
     subQueryJoin(dimension) {
         const { prefix, subQuery, cubeName } = this.subQueryDescription(dimension);
-        const primaryKey = this.newDimension(this.primaryKeyName(cubeName));
+        const primaryKeys = this.cubeEvaluator.primaryKeys[cubeName];
         const subQueryAlias = this.escapeColumnName(this.aliasName(prefix));
         const { collectOriginalSqlPreAggregations } = this.safeEvaluateSymbolContext();
         const sql = subQuery.evaluateSymbolSqlWithContext(() => subQuery.buildParamAnnotatedSql(), {
@@ -725,7 +767,7 @@ class BaseQuery {
         return {
             sql: `(${sql})`,
             alias: subQueryAlias,
-            on: `${subQueryAlias}.${primaryKey.aliasName()} = ${this.primaryKeySql(this.cubeEvaluator.primaryKeys[cubeName], cubeName)}`
+            on: primaryKeys.map((pk) => `${subQueryAlias}.${this.newDimension(this.primaryKeyName(cubeName, pk)).aliasName()} = ${this.primaryKeySql(pk, cubeName)}`)
         };
     }
     get filtersWithoutSubQueries() {
@@ -761,7 +803,7 @@ class BaseQuery {
                     cubeName,
                     name
                 }],
-            dimensions: [this.primaryKeyName(cubeName)],
+            dimensions: this.primaryKeyNames(cubeName),
             filters,
             segments,
             timeDimensions,
@@ -781,7 +823,7 @@ class BaseQuery {
     }
     aggregateSubQuery(keyCubeName, measures, filters) {
         filters = filters || this.allFilters;
-        const primaryKeyDimension = this.newDimension(this.primaryKeyName(keyCubeName));
+        const primaryKeyDimensions = this.primaryKeyNames(keyCubeName).map((k) => this.newDimension(k));
         const shouldBuildJoinForMeasureSelect = this.checkShouldBuildJoinForMeasureSelect(measures, keyCubeName);
         let keyCubeSql;
         let keyCubeAlias;
@@ -793,7 +835,7 @@ class BaseQuery {
             if (measuresJoin.multiplicationFactor[keyCubeName]) {
                 throw new UserError_1.UserError(`'${measures.map(m => m.measure).join(', ')}' reference cubes that lead to row multiplication.`);
             }
-            keyCubeSql = `(${this.aggregateSubQueryMeasureJoin(keyCubeName, measures, measuresJoin, primaryKeyDimension, measureSubQueryDimensions)})`;
+            keyCubeSql = `(${this.aggregateSubQueryMeasureJoin(keyCubeName, measures, measuresJoin, primaryKeyDimensions, measureSubQueryDimensions)})`;
             keyCubeAlias = this.cubeAlias(keyCubeName);
         }
         else {
@@ -804,16 +846,16 @@ class BaseQuery {
             ungroupedAliases: ramda_1.default.fromPairs(measures.map(m => [m.measure, m.aliasName()]))
         }) : measureSelectFn();
         const columnsForSelect = this.dimensionColumns(this.escapeColumnName('keys')).concat(selectedMeasures).filter(s => !!s).join(', ');
-        const keyInMeasureSelect = shouldBuildJoinForMeasureSelect ?
-            `${this.cubeAlias(keyCubeName)}.${primaryKeyDimension.aliasName()}` :
-            this.dimensionSql(primaryKeyDimension);
+        const primaryKeyJoinConditions = primaryKeyDimensions.map((pkd) => `${this.escapeColumnName('keys')}.${pkd.aliasName()} = ${shouldBuildJoinForMeasureSelect ?
+            `${this.cubeAlias(keyCubeName)}.${pkd.aliasName()}` :
+            this.dimensionSql(pkd)}`).join(' AND ');
         const subQueryJoins = shouldBuildJoinForMeasureSelect ? [] : measureSubQueryDimensions.map(d => this.subQueryJoin(d));
         const joinSql = this.joinSql([
-            { sql: `(${this.keysQuery(primaryKeyDimension, filters)})`, alias: this.escapeColumnName('keys') },
+            { sql: `(${this.keysQuery(primaryKeyDimensions, filters)})`, alias: this.escapeColumnName('keys') },
             {
                 sql: keyCubeSql,
                 alias: keyCubeAlias,
-                on: `${this.escapeColumnName('keys')}.${primaryKeyDimension.aliasName()} = ${keyInMeasureSelect}
+                on: `${primaryKeyJoinConditions}
              ${keyCubeInlineLeftJoinConditions ? ` AND (${keyCubeInlineLeftJoinConditions})` : ''}`
             },
             ...subQueryJoins
@@ -834,9 +876,9 @@ class BaseQuery {
             return false;
         }).reduce((a, b) => a || b);
     }
-    aggregateSubQueryMeasureJoin(keyCubeName, measures, measuresJoin, primaryKeyDimension, measureSubQueryDimensions) {
+    aggregateSubQueryMeasureJoin(keyCubeName, measures, measuresJoin, primaryKeyDimensions, measureSubQueryDimensions) {
         return this.ungroupedMeasureSelect(() => this.withCubeAliasPrefix(`${keyCubeName}_measure_join`, () => {
-            const columns = [primaryKeyDimension.selectColumns()].concat(measures.map(m => m.selectColumns()))
+            const columns = primaryKeyDimensions.map(p => p.selectColumns()).concat(measures.map(m => m.selectColumns()))
                 .filter(s => !!s).join(', ');
             return `SELECT ${columns} FROM ${this.joinQuery(measuresJoin, measureSubQueryDimensions)}`;
         }));
@@ -847,18 +889,18 @@ class BaseQuery {
     ungroupedMeasureSelect(select) {
         return this.evaluateSymbolSqlWithContext(select, { ungrouped: true });
     }
-    keysQuery(primaryKeyDimension, filters) {
+    keysQuery(primaryKeyDimensions, filters) {
         const inlineWhereConditions = [];
-        const query = this.rewriteInlineWhere(() => this.joinQuery(this.join, this.collectFrom(this.keyDimensions(primaryKeyDimension), this.collectSubQueryDimensionsFor.bind(this), 'collectSubQueryDimensionsFor')), inlineWhereConditions);
-        return `SELECT DISTINCT ${this.keysSelect(primaryKeyDimension)} FROM ${query} ${this.baseWhere(filters.concat(inlineWhereConditions))}`;
+        const query = this.rewriteInlineWhere(() => this.joinQuery(this.join, this.collectFrom(this.keyDimensions(primaryKeyDimensions), this.collectSubQueryDimensionsFor.bind(this), 'collectSubQueryDimensionsFor')), inlineWhereConditions);
+        return `SELECT DISTINCT ${this.keysSelect(primaryKeyDimensions)} FROM ${query} ${this.baseWhere(filters.concat(inlineWhereConditions))}`;
     }
-    keysSelect(primaryKeyDimension) {
-        return ramda_1.default.flatten(this.keyDimensions(primaryKeyDimension)
+    keysSelect(primaryKeyDimensions) {
+        return ramda_1.default.flatten(this.keyDimensions(primaryKeyDimensions)
             .map(s => s.selectColumns())).filter(s => !!s).join(', ');
     }
-    keyDimensions(primaryKeyDimension) {
-        return this.dimensionsForSelect()
-            .concat(ramda_1.default.none(d => d.dimension === primaryKeyDimension.dimension, this.dimensionsForSelect()) ? [primaryKeyDimension] : []);
+    keyDimensions(primaryKeyDimensions) {
+        return ramda_1.default.uniqBy((d) => d.dimension, this.dimensionsForSelect()
+            .concat(primaryKeyDimensions));
     }
     cubeSql(cube) {
         const foundPreAggregation = this.preAggregations.findPreAggregationToUseForCube(cube);
@@ -1043,8 +1085,11 @@ class BaseQuery {
                     this.safeEvaluateSymbolContext().leafMeasures[this.safeEvaluateSymbolContext().currentMeasure] = true;
                 }
             }
+            const primaryKeys = this.cubeEvaluator.primaryKeys[cubeName];
             const result = this.renderSqlMeasure(name, this.applyMeasureFilters(this.autoPrefixWithCubeName(cubeName, symbol.sql && this.evaluateSql(cubeName, symbol.sql) ||
-                this.cubeEvaluator.primaryKeys[cubeName] && this.primaryKeySql(this.cubeEvaluator.primaryKeys[cubeName], cubeName) || '*'), symbol, cubeName), symbol, cubeName, parentMeasure);
+                primaryKeys.length && (primaryKeys.length > 1 ?
+                    this.concatStringsSql(primaryKeys.map((pk) => this.castToString(this.primaryKeySql(pk, cubeName))))
+                    : this.primaryKeySql(primaryKeys[0], cubeName)) || '*'), symbol, cubeName), symbol, cubeName, parentMeasure);
             if (this.safeEvaluateSymbolContext().compositeCubeMeasures ||
                 this.safeEvaluateSymbolContext().leafMeasures) {
                 this.safeEvaluateSymbolContext().currentMeasure = parentMeasure;
@@ -1084,11 +1129,14 @@ class BaseQuery {
     concatStringsSql(strings) {
         return strings.join(' || ');
     }
-    primaryKeyName(cubeName) {
-        const primaryKey = this.cubeEvaluator.primaryKeys[cubeName];
-        if (!primaryKey) {
-            throw new UserError_1.UserError(`Primary key is required for '${cubeName}`);
+    primaryKeyNames(cubeName) {
+        const primaryKeys = this.cubeEvaluator.primaryKeys[cubeName];
+        if (!primaryKeys || !primaryKeys.length) {
+            throw new UserError_1.UserError(`One or more Primary key is required for '${cubeName}`);
         }
+        return primaryKeys.map((pk) => this.primaryKeyName(cubeName, pk));
+    }
+    primaryKeyName(cubeName, primaryKey) {
         return `${cubeName}.${primaryKey}`;
     }
     evaluateSql(cubeName, sql, options) {
@@ -1246,12 +1294,15 @@ class BaseQuery {
         }
         return evaluateSql;
     }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     hllInit(sql) {
         throw new UserError_1.UserError('Distributed approximate distinct count is not supported by this DB');
     }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     hllMerge(sql) {
         throw new UserError_1.UserError('Distributed approximate distinct count is not supported by this DB');
     }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     hllCardinality(sql) {
         throw new UserError_1.UserError('Distributed approximate distinct count is not supported by this DB');
     }
@@ -1261,11 +1312,18 @@ class BaseQuery {
     hllCardinalityMerge(sql) {
         return this.hllMerge(sql);
     }
+    castToString(sql) {
+        return `CAST(${sql} as TEXT)`;
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     countDistinctApprox(sql) {
         throw new UserError_1.UserError('Approximate distinct count is not supported by this DB');
     }
     primaryKeyCount(cubeName, distinct) {
-        const primaryKeySql = this.primaryKeySql(this.cubeEvaluator.primaryKeys[cubeName], cubeName);
+        const primaryKeys = this.cubeEvaluator.primaryKeys[cubeName];
+        const primaryKeySql = primaryKeys.length > 1 ?
+            this.concatStringsSql(primaryKeys.map((pk) => this.castToString(this.primaryKeySql(pk, cubeName)))) :
+            this.primaryKeySql(primaryKeys[0], cubeName);
         return `count(${distinct ? 'distinct ' : ''}${primaryKeySql})`;
     }
     renderDimensionCase(symbol, cubeName) {
@@ -1323,9 +1381,11 @@ class BaseQuery {
      * @param {string} field
      * @return {string}
      */
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     convertTz(field) {
         throw new Error('Not implemented');
     }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     timeGroupedColumn(granularity, dimension) {
         throw new Error('Not implemented');
     }