@cubejs-backend/server-core 0.29.53 → 0.29.54
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.
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,17 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [0.29.54](https://github.com/cube-js/cube.js/compare/v0.29.53...v0.29.54) (2022-05-03)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Features
|
|
10
|
+
|
|
11
|
+
* **cubejs:** rollupJoin between multiple databases ([#4371](https://github.com/cube-js/cube.js/issues/4371)) ([6cd77d5](https://github.com/cube-js/cube.js/commit/6cd77d542ec8af570f556a4cefd1710ab2e5f508))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
6
17
|
## [0.29.53](https://github.com/cube-js/cube.js/compare/v0.29.52...v0.29.53) (2022-04-29)
|
|
7
18
|
|
|
8
19
|
|
|
@@ -21,6 +21,8 @@ export class CompilerApi {
|
|
|
21
21
|
}): Promise<any>;
|
|
22
22
|
compilers: any;
|
|
23
23
|
compilerVersion: any;
|
|
24
|
+
queryFactory: QueryFactory;
|
|
25
|
+
createQueryFactory(compilers: any): Promise<QueryFactory>;
|
|
24
26
|
getDbType(dataSource?: string): any;
|
|
25
27
|
getDialectClass(dataSource: string, dbType: any): any;
|
|
26
28
|
getSql(query: any, options?: {}): Promise<any>;
|
|
@@ -31,4 +33,5 @@ export class CompilerApi {
|
|
|
31
33
|
metaConfig(options: any): Promise<any>;
|
|
32
34
|
canUsePreAggregationForTransformedQuery(transformedQuery: any, refs: any): any;
|
|
33
35
|
}
|
|
36
|
+
import { QueryFactory } from "@cubejs-backend/schema-compiler/dist/src/adapter/QueryFactory";
|
|
34
37
|
//# sourceMappingURL=CompilerApi.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CompilerApi.d.ts","sourceRoot":"","sources":["../../../src/core/CompilerApi.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"CompilerApi.d.ts","sourceRoot":"","sources":["../../../src/core/CompilerApi.js"],"names":[],"mappings":"AAIA;IACE,wDAcC;IAbC,gBAA4B;IAC5B,YAAoB;IACpB,kBAAwC;IACxC,aAA4B;IAC5B,sBAA0F;IAC1F,YAAiC;IACjC,2BAA+D;IAC/D,qCAAmF;IACnF,mBAA+C;IAC/C,oBAA4C;IAC5C,mCAA0E;IAC1E,cAAgC;IAChC,gBAAoC;IAGtC,oCAEC;IADC,mBAA2B;IAG7B,wBAEC;IAED;;qBA+BC;IAXG,eAKE;IACF,qBAAsC;IACtC,2BAAiE;IAMrE,0DAWC;IAED,oCAMC;IAED,sDAEC;IAED,+CAiDC;IAED,2CAGC;IAED,yCAGC;IAED,0EAIC;IAED,6EAcC;IAED,uCAEC;IAED,+EAEC;CACF"}
|
|
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.CompilerApi = void 0;
|
|
7
7
|
const crypto_1 = __importDefault(require("crypto"));
|
|
8
|
+
const ramda_1 = __importDefault(require("ramda"));
|
|
8
9
|
const schema_compiler_1 = require("@cubejs-backend/schema-compiler");
|
|
9
10
|
class CompilerApi {
|
|
10
11
|
constructor(repository, dbType, options) {
|
|
@@ -43,17 +44,28 @@ class CompilerApi {
|
|
|
43
44
|
version: compilerVersion,
|
|
44
45
|
requestId
|
|
45
46
|
});
|
|
46
|
-
|
|
47
|
-
this.compilers = schema_compiler_1.compile(this.repository, {
|
|
47
|
+
this.compilers = await schema_compiler_1.compile(this.repository, {
|
|
48
48
|
allowNodeRequire: this.allowNodeRequire,
|
|
49
49
|
compileContext: this.compileContext,
|
|
50
50
|
allowJsDuplicatePropsInSchema: this.allowJsDuplicatePropsInSchema,
|
|
51
|
-
standalone: this.standalone
|
|
51
|
+
standalone: this.standalone,
|
|
52
52
|
});
|
|
53
53
|
this.compilerVersion = compilerVersion;
|
|
54
|
+
this.queryFactory = await this.createQueryFactory(this.compilers);
|
|
54
55
|
}
|
|
55
56
|
return this.compilers;
|
|
56
57
|
}
|
|
58
|
+
async createQueryFactory(compilers) {
|
|
59
|
+
const { cubeEvaluator } = compilers;
|
|
60
|
+
const cubeToQueryClass = ramda_1.default.fromPairs(cubeEvaluator.cubeNames().map(cube => {
|
|
61
|
+
var _a;
|
|
62
|
+
const dataSource = (_a = cubeEvaluator.cubeFromPath(cube).dataSource) !== null && _a !== void 0 ? _a : 'default';
|
|
63
|
+
const dbType = this.getDbType(dataSource);
|
|
64
|
+
const dialectClass = this.getDialectClass(dataSource, dbType);
|
|
65
|
+
return [cube, schema_compiler_1.queryClass(dbType, dialectClass)];
|
|
66
|
+
}));
|
|
67
|
+
return new schema_compiler_1.QueryFactory(cubeToQueryClass);
|
|
68
|
+
}
|
|
57
69
|
getDbType(dataSource = 'default') {
|
|
58
70
|
if (typeof this.dbType === 'function') {
|
|
59
71
|
return this.dbType({ dataSource, });
|
|
@@ -122,7 +134,8 @@ class CompilerApi {
|
|
|
122
134
|
externalDialectClass: this.options.externalDialectClass,
|
|
123
135
|
externalDbType: this.options.externalDbType,
|
|
124
136
|
preAggregationsSchema: this.preAggregationsSchema,
|
|
125
|
-
allowUngroupedWithoutPrimaryKey: this.allowUngroupedWithoutPrimaryKey
|
|
137
|
+
allowUngroupedWithoutPrimaryKey: this.allowUngroupedWithoutPrimaryKey,
|
|
138
|
+
queryFactory: this.queryFactory,
|
|
126
139
|
});
|
|
127
140
|
}
|
|
128
141
|
async metaConfig(options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CompilerApi.js","sourceRoot":"","sources":["../../../src/core/CompilerApi.js"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"CompilerApi.js","sourceRoot":"","sources":["../../../src/core/CompilerApi.js"],"names":[],"mappings":"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"}
|
package/dist/src/core/server.js
CHANGED
|
@@ -578,7 +578,7 @@ class CubejsServerCore {
|
|
|
578
578
|
externalDbType: options.externalDbType,
|
|
579
579
|
preAggregationsSchema: options.preAggregationsSchema,
|
|
580
580
|
allowUngroupedWithoutPrimaryKey: this.options.allowUngroupedWithoutPrimaryKey ||
|
|
581
|
-
shared_1.getEnv(
|
|
581
|
+
shared_1.getEnv('allowUngroupedWithoutPrimaryKey'),
|
|
582
582
|
compileContext: options.context,
|
|
583
583
|
dialectClass: options.dialectClass,
|
|
584
584
|
externalDialectClass: options.externalDialectClass,
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@cubejs-backend/server-core",
|
|
3
3
|
"description": "Cube.js base component to wire all backend components together",
|
|
4
4
|
"author": "Cube Dev, Inc.",
|
|
5
|
-
"version": "0.29.
|
|
5
|
+
"version": "0.29.54",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
8
8
|
"url": "https://github.com/cube-js/cube.js.git",
|
|
@@ -30,11 +30,11 @@
|
|
|
30
30
|
"unit": "jest --runInBand --coverage dist/test"
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
|
33
|
-
"@cubejs-backend/api-gateway": "^0.29.
|
|
33
|
+
"@cubejs-backend/api-gateway": "^0.29.54",
|
|
34
34
|
"@cubejs-backend/cloud": "^0.29.51",
|
|
35
35
|
"@cubejs-backend/dotenv": "^9.0.2",
|
|
36
36
|
"@cubejs-backend/query-orchestrator": "^0.29.51",
|
|
37
|
-
"@cubejs-backend/schema-compiler": "^0.29.
|
|
37
|
+
"@cubejs-backend/schema-compiler": "^0.29.54",
|
|
38
38
|
"@cubejs-backend/shared": "^0.29.51",
|
|
39
39
|
"@cubejs-backend/templates": "^0.29.51",
|
|
40
40
|
"@hapi/joi": "^15.1.1",
|
|
@@ -55,9 +55,9 @@
|
|
|
55
55
|
"ws": "^7.5.3"
|
|
56
56
|
},
|
|
57
57
|
"devDependencies": {
|
|
58
|
-
"@cubejs-backend/cubestore-driver": "^0.29.
|
|
58
|
+
"@cubejs-backend/cubestore-driver": "^0.29.54",
|
|
59
59
|
"@cubejs-backend/linter": "^0.29.23",
|
|
60
|
-
"@cubejs-client/playground": "^0.29.
|
|
60
|
+
"@cubejs-client/playground": "^0.29.54",
|
|
61
61
|
"@types/cross-spawn": "^6.0.2",
|
|
62
62
|
"@types/express": "^4.17.9",
|
|
63
63
|
"@types/fs-extra": "^9.0.8",
|
|
@@ -90,5 +90,5 @@
|
|
|
90
90
|
".*\\.d\\.ts"
|
|
91
91
|
]
|
|
92
92
|
},
|
|
93
|
-
"gitHead": "
|
|
93
|
+
"gitHead": "c5383fcfaaa088e6ca09cee3384da163d3ad6af5"
|
|
94
94
|
}
|