@cubejs-backend/schema-compiler 0.34.35 → 0.34.37
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CubeStoreQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/CubeStoreQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAqB5C,KAAK,aAAa,GAAG;IACnB,QAAQ,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAC/B,MAAM,CAAC,EAAE,OAAO,GAAG,KAAK,CAAC;CAC1B,CAAC;AAEF,qBAAa,cAAe,SAAQ,SAAS;IACpC,SAAS,CAAC,MAAM,KAAA;IAIhB,SAAS,CAAC,KAAK,KAAA;IAIf,cAAc;IAId,aAAa,CAAC,KAAK,KAAA;IAInB,eAAe;IAIf,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,gBAAgB,CAAC,IAAI,KAAA;IAIrB,SAAS,CAAC,aAAa,KAAA;IAOvB,gBAAgB,CAAC,OAAO,KAAA;IAIxB,gBAAgB;IAIhB,6BAA6B,CAAC,GAAG,KAAA;IAIjC,QAAQ,CAAC,GAAG,KAAA;IAIZ,mBAAmB,CAAC,GAAG,KAAA;IAIvB,cAAc,CAAC,GAAG,KAAA;IAIlB,YAAY,CAAC,GAAG,KAAA;IAIhB,mBAAmB,CAAC,GAAG,KAAA;IAKvB,+BAA+B,CACpC,eAAe,EAAE,WAAW,EAAE,EAC9B,kBAAkB,EAAE,WAAW,EAAE,EACjC,kBAAkB,EAAE,KAAK,CAAC,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,EACjD,sBAAsB,EAAE,GAAG;
|
|
1
|
+
{"version":3,"file":"CubeStoreQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/CubeStoreQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAqB5C,KAAK,aAAa,GAAG;IACnB,QAAQ,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAC/B,MAAM,CAAC,EAAE,OAAO,GAAG,KAAK,CAAC;CAC1B,CAAC;AAEF,qBAAa,cAAe,SAAQ,SAAS;IACpC,SAAS,CAAC,MAAM,KAAA;IAIhB,SAAS,CAAC,KAAK,KAAA;IAIf,cAAc;IAId,aAAa,CAAC,KAAK,KAAA;IAInB,eAAe;IAIf,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,gBAAgB,CAAC,IAAI,KAAA;IAIrB,SAAS,CAAC,aAAa,KAAA;IAOvB,gBAAgB,CAAC,OAAO,KAAA;IAIxB,gBAAgB;IAIhB,6BAA6B,CAAC,GAAG,KAAA;IAIjC,QAAQ,CAAC,GAAG,KAAA;IAIZ,mBAAmB,CAAC,GAAG,KAAA;IAIvB,cAAc,CAAC,GAAG,KAAA;IAIlB,YAAY,CAAC,GAAG,KAAA;IAIhB,mBAAmB,CAAC,GAAG,KAAA;IAKvB,+BAA+B,CACpC,eAAe,EAAE,WAAW,EAAE,EAC9B,kBAAkB,EAAE,WAAW,EAAE,EACjC,kBAAkB,EAAE,KAAK,CAAC,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,EACjD,sBAAsB,EAAE,GAAG;IA6CtB,0BAA0B,CAAC,kBAAkB,KAAA,EAAE,aAAa,KAAA,EAAE,SAAS,KAAA,EAAE,cAAc,KAAA,EAAE,aAAa,KAAA,EAAE,sBAAsB,KAAA;IAW9H,UAAU,CAAC,QAAQ,KAAA;IAQnB,gBAAgB,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,aAAa;IAyCnE,6BAA6B,CAAC,kBAAkB,KAAA,EAAE,aAAa,KAAA,EAAE,aAAa,KAAA,EAAE,sBAAsB,KAAA;CA8C9G"}
|
|
@@ -90,18 +90,19 @@ class CubeStoreQuery extends BaseQuery_1.BaseQuery {
|
|
|
90
90
|
}
|
|
91
91
|
const cumulativeMeasuresWithoutMultiplied = cumulativeMeasures.map(([_, measure]) => measure);
|
|
92
92
|
const allMeasures = regularMeasures.concat(multipliedMeasures).concat(cumulativeMeasuresWithoutMultiplied);
|
|
93
|
-
const timeDimension = this.timeDimensions.find(d => d.granularity);
|
|
93
|
+
const timeDimension = this.timeDimensions.find(d => d.granularity || d.dateRange);
|
|
94
|
+
const timeDimensionWithGranularity = timeDimension?.granularity ? timeDimension : null;
|
|
94
95
|
const baseQueryAlias = this.cubeAlias('base');
|
|
95
96
|
const maxRollingWindow = cumulativeMeasuresWithoutMultiplied.reduce((a, b) => this.maxRollingWindow(a, b.rollingWindowDefinition()), null);
|
|
96
97
|
const commonDateCondition = this.rollingWindowDateJoinCondition(maxRollingWindow.trailing, maxRollingWindow.leading, maxRollingWindow.offset);
|
|
97
98
|
const filters = this.segments.concat(this.filters).concat(timeDimension?.dateRange && this.dateFromStartToEndConditionSql(commonDateCondition, true, true) || []);
|
|
98
99
|
const rollupGranularity = this.preAggregations?.castGranularity(preAggregationForQuery.preAggregation.granularity) || 'day';
|
|
99
|
-
const granularityOverride =
|
|
100
|
-
cumulativeMeasuresWithoutMultiplied.reduce((a, b) => this.minGranularity(a, b.windowGranularity()),
|
|
100
|
+
const granularityOverride = timeDimensionWithGranularity &&
|
|
101
|
+
cumulativeMeasuresWithoutMultiplied.reduce((a, b) => this.minGranularity(a, b.windowGranularity()), timeDimensionWithGranularity.granularity) || rollupGranularity;
|
|
101
102
|
return this.evaluateSymbolSqlWithContext(() => this.overTimeSeriesSelectRollup(cumulativeMeasuresWithoutMultiplied, regularMeasures.concat(multipliedMeasures), this.evaluateSymbolSqlWithContext(() => this.preAggregations?.rollupPreAggregation(preAggregationForQuery, allMeasures, false, filters), {
|
|
102
103
|
granularityOverride,
|
|
103
104
|
overTimeSeriesAggregate: true
|
|
104
|
-
}), baseQueryAlias,
|
|
105
|
+
}), baseQueryAlias, timeDimensionWithGranularity, preAggregationForQuery), {
|
|
105
106
|
wrapQuery: true,
|
|
106
107
|
wrappedGranularity: timeDimension?.granularity || rollupGranularity,
|
|
107
108
|
rollupGranularity: granularityOverride,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CubeStoreQuery.js","sourceRoot":"","sources":["../../../src/adapter/CubeStoreQuery.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"CubeStoreQuery.js","sourceRoot":"","sources":["../../../src/adapter/CubeStoreQuery.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@cubejs-backend/schema-compiler",
|
|
3
3
|
"description": "Cube schema compiler",
|
|
4
4
|
"author": "Cube Dev, Inc.",
|
|
5
|
-
"version": "0.34.
|
|
5
|
+
"version": "0.34.37",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
8
8
|
"url": "https://github.com/cube-js/cube.git",
|
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
"@babel/standalone": "^7.12.10",
|
|
41
41
|
"@babel/traverse": "^7.12.10",
|
|
42
42
|
"@babel/types": "^7.12.12",
|
|
43
|
-
"@cubejs-backend/native": "^0.34.
|
|
43
|
+
"@cubejs-backend/native": "^0.34.37",
|
|
44
44
|
"@cubejs-backend/shared": "^0.34.33",
|
|
45
45
|
"antlr4ts": "0.5.0-alpha.4",
|
|
46
46
|
"camelcase": "^6.2.0",
|
|
@@ -59,7 +59,7 @@
|
|
|
59
59
|
"devDependencies": {
|
|
60
60
|
"@apla/clickhouse": "^1.5.5",
|
|
61
61
|
"@cubejs-backend/linter": "^0.34.25",
|
|
62
|
-
"@cubejs-backend/query-orchestrator": "^0.34.
|
|
62
|
+
"@cubejs-backend/query-orchestrator": "^0.34.37",
|
|
63
63
|
"@types/babel__code-frame": "^7.0.2",
|
|
64
64
|
"@types/babel__generator": "^7.6.2",
|
|
65
65
|
"@types/babel__parser": "^7.1.1",
|
|
@@ -102,5 +102,5 @@
|
|
|
102
102
|
],
|
|
103
103
|
"globalSetup": "<rootDir>/dist/test/global-setup.js"
|
|
104
104
|
},
|
|
105
|
-
"gitHead": "
|
|
105
|
+
"gitHead": "595c23dc095825180036b2c3950671d6a75065eb"
|
|
106
106
|
}
|