@cubejs-backend/schema-compiler 0.33.41 → 0.33.43
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/dist/src/adapter/MssqlQuery.d.ts.map +1 -1
- package/dist/src/adapter/MssqlQuery.js +7 -2
- package/dist/src/adapter/MssqlQuery.js.map +1 -1
- package/dist/src/scaffolding/ScaffoldingTemplate.d.ts +1 -0
- package/dist/src/scaffolding/ScaffoldingTemplate.d.ts.map +1 -1
- package/dist/src/scaffolding/ScaffoldingTemplate.js +7 -3
- package/dist/src/scaffolding/ScaffoldingTemplate.js.map +1 -1
- package/dist/src/scaffolding/formatters/BaseSchemaFormatter.d.ts +1 -0
- package/dist/src/scaffolding/formatters/BaseSchemaFormatter.d.ts.map +1 -1
- package/dist/src/scaffolding/formatters/BaseSchemaFormatter.js +4 -1
- package/dist/src/scaffolding/formatters/BaseSchemaFormatter.js.map +1 -1
- package/package.json +5 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MssqlQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/MssqlQuery.js"],"names":[],"mappings":"AAsDA;IACE,oCAEC;IAED,8BAEC;IAUD,yDAEC;IAED,yCAEC;
|
|
1
|
+
{"version":3,"file":"MssqlQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/MssqlQuery.js"],"names":[],"mappings":"AAsDA;IACE,oCAEC;IAED,8BAEC;IAUD,yDAEC;IAED,yCAEC;IA+ED,gDAEC;CAmBF;;AAxID;IAME,qEAIC;CACF;AA5BD;IACE,0CAEC;CACF"}
|
|
@@ -106,11 +106,16 @@ class MssqlQuery extends BaseQuery_1.BaseQuery {
|
|
|
106
106
|
return dimensionColumns.length ? ` GROUP BY ${dimensionColumns.join(', ')}` : '';
|
|
107
107
|
}
|
|
108
108
|
overTimeSeriesSelect(cumulativeMeasures, dateSeriesSql, baseQuery, dateJoinConditionSql, baseQueryAlias) {
|
|
109
|
-
|
|
109
|
+
// Group by time dimensions
|
|
110
|
+
const timeDimensionsColumns = this.timeDimensions.map((t) => `${t.dateSeriesAliasName()}.${this.escapeColumnName('date_from')}`);
|
|
111
|
+
// Group by regular dimensions
|
|
112
|
+
const dimensionColumns = ramda_1.default.flatten(this.dimensions.map(s => s.selectColumns() && s.dimensionSql() && s.aliasName())).filter(s => !!s);
|
|
113
|
+
// Combine time dimensions and regular dimensions for GROUP BY clause
|
|
114
|
+
const allGroupByColumns = timeDimensionsColumns.concat(dimensionColumns);
|
|
110
115
|
const forSelect = this.overTimeSeriesForSelect(cumulativeMeasures);
|
|
111
116
|
return (`SELECT ${forSelect} FROM ${dateSeriesSql}` +
|
|
112
117
|
` LEFT JOIN (${baseQuery}) ${this.asSyntaxJoin} ${baseQueryAlias} ON ${dateJoinConditionSql}` +
|
|
113
|
-
` GROUP BY ${
|
|
118
|
+
` GROUP BY ${allGroupByColumns.join(', ')}`);
|
|
114
119
|
}
|
|
115
120
|
nowTimestampSql() {
|
|
116
121
|
return 'CURRENT_TIMESTAMP';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MssqlQuery.js","sourceRoot":"","sources":["../../../src/adapter/MssqlQuery.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"MssqlQuery.js","sourceRoot":"","sources":["../../../src/adapter/MssqlQuery.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScaffoldingTemplate.d.ts","sourceRoot":"","sources":["../../../src/scaffolding/ScaffoldingTemplate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"ScaffoldingTemplate.d.ts","sourceRoot":"","sources":["../../../src/scaffolding/ScaffoldingTemplate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAMpE,OAAO,EACL,cAAc,EACd,oBAAoB,EACpB,cAAc,EACd,SAAS,EACV,MAAM,qBAAqB,CAAC;AAE7B,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,EAAE,oBAAoB,EAAE,CAAC;IACjC,UAAU,EAAE,oBAAoB,EAAE,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,gBAAgB,GACxB,gBAAgB,EAAE,GAClB,MAAM,GACN,MAAM,GACN,eAAe,GACf,iBAAiB,GACjB,MAAM,CAAC;AAEX,oBAAY,YAAY;IACtB,UAAU,OAAO;IACjB,IAAI,SAAS;CACd;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB,CAAC;AAEF,qBAAa,mBAAmB;IAK5B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,0BAA0B;IALxD,OAAO,CAAC,cAAc,CAAsB;gBAG1C,QAAQ,EAAE,cAAc,EACP,MAAM,KAAA,EACJ,OAAO,GAAE,0BAE3B;IAaI,yBAAyB,CAC9B,UAAU,EAAE,SAAS,EAAE,EACvB,aAAa,GAAE,aAAkB;IAQ5B,8BAA8B,CACnC,eAAe,EAAE,cAAc,EAAE,EACjC,aAAa,GAAE,aAAkB;CAOpC"}
|
|
@@ -9,14 +9,18 @@ var SchemaFormat;
|
|
|
9
9
|
})(SchemaFormat = exports.SchemaFormat || (exports.SchemaFormat = {}));
|
|
10
10
|
class ScaffoldingTemplate {
|
|
11
11
|
constructor(dbSchema, driver, options = {
|
|
12
|
-
snakeCase: false
|
|
12
|
+
snakeCase: false,
|
|
13
13
|
}) {
|
|
14
14
|
this.driver = driver;
|
|
15
15
|
this.options = options;
|
|
16
|
+
const formatterOptions = {
|
|
17
|
+
snakeCase: Boolean(this.options.snakeCase),
|
|
18
|
+
catalog: this.options.catalog,
|
|
19
|
+
};
|
|
16
20
|
this.formatStrategy =
|
|
17
21
|
options.format === SchemaFormat.Yaml
|
|
18
|
-
? new formatters_1.YamlSchemaFormatter(dbSchema, this.driver,
|
|
19
|
-
: new formatters_1.JavaScriptSchemaFormatter(dbSchema, this.driver,
|
|
22
|
+
? new formatters_1.YamlSchemaFormatter(dbSchema, this.driver, formatterOptions)
|
|
23
|
+
: new formatters_1.JavaScriptSchemaFormatter(dbSchema, this.driver, formatterOptions);
|
|
20
24
|
}
|
|
21
25
|
generateFilesByTableNames(tableNames, schemaContext = {}) {
|
|
22
26
|
return this.formatStrategy.generateFilesByTableNames(tableNames, schemaContext);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScaffoldingTemplate.js","sourceRoot":"","sources":["../../../src/scaffolding/ScaffoldingTemplate.ts"],"names":[],"mappings":";;;AAEA,
|
|
1
|
+
{"version":3,"file":"ScaffoldingTemplate.js","sourceRoot":"","sources":["../../../src/scaffolding/ScaffoldingTemplate.ts"],"names":[],"mappings":";;;AAEA,6CAIsB;AAyBtB,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,iCAAiB,CAAA;IACjB,6BAAa,CAAA;AACf,CAAC,EAHW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAGvB;AAQD,MAAa,mBAAmB;IAG9B,YACE,QAAwB,EACP,MAAM,EACJ,UAAsC;QACvD,SAAS,EAAE,KAAK;KACjB;QAHgB,WAAM,GAAN,MAAM,CAAA;QACJ,YAAO,GAAP,OAAO,CAEzB;QAED,MAAM,gBAAgB,GAAG;YACvB,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;YAC1C,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO;SAC9B,CAAC;QAEF,IAAI,CAAC,cAAc;YACjB,OAAO,CAAC,MAAM,KAAK,YAAY,CAAC,IAAI;gBAClC,CAAC,CAAC,IAAI,gCAAmB,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,gBAAgB,CAAC;gBAClE,CAAC,CAAC,IAAI,sCAAyB,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAC/E,CAAC;IAEM,yBAAyB,CAC9B,UAAuB,EACvB,gBAA+B,EAAE;QAEjC,OAAO,IAAI,CAAC,cAAc,CAAC,yBAAyB,CAClD,UAAU,EACV,aAAa,CACd,CAAC;IACJ,CAAC;IAEM,8BAA8B,CACnC,eAAiC,EACjC,gBAA+B,EAAE;QAEjC,OAAO,IAAI,CAAC,cAAc,CAAC,8BAA8B,CACvD,eAAe,EACf,aAAa,CACd,CAAC;IACJ,CAAC;CACF;AAxCD,kDAwCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseSchemaFormatter.d.ts","sourceRoot":"","sources":["../../../../src/scaffolding/formatters/BaseSchemaFormatter.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,EACL,cAAc,EACd,cAAc,EAEd,iBAAiB,EACjB,SAAS,EACT,WAAW,EACZ,MAAM,sBAAsB,CAAC;AAU9B,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"BaseSchemaFormatter.d.ts","sourceRoot":"","sources":["../../../../src/scaffolding/formatters/BaseSchemaFormatter.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,EACL,cAAc,EACd,cAAc,EAEd,iBAAiB,EACjB,SAAS,EACT,WAAW,EACZ,MAAM,sBAAsB,CAAC;AAU9B,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB,CAAC;AAEF,8BAAsB,mBAAmB;IAInC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,cAAc;IAC3C,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG;IAC9B,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,sBAAsB;IALtD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;gBAGjC,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,GAAG,EACX,OAAO,EAAE,sBAAsB;aAKtC,aAAa,IAAI,MAAM;IAEvC,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAEtD,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM;IAEvE,yBAAyB,CAC9B,UAAU,EAAE,SAAS,EAAE,EACvB,aAAa,GAAE,aAAkB,GAChC,UAAU,EAAE;IAWR,8BAA8B,CACnC,eAAe,EAAE,cAAc,EAAE,EACjC,aAAa,GAAE,aAAkB,GAChC,UAAU,EAAE;IAOf,SAAS,CAAC,YAAY,CAAC,CAAC,KAAA;IAQxB,SAAS,CAAC,WAAW,CAAC,CAAC,KAAA;IAMvB,SAAS,CAAC,UAAU,CAAC,MAAM,KAAA;IAU3B,SAAS,CAAC,UAAU,CAAC,IAAI,KAAA;IAOzB,SAAS,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM;IAIlC,wBAAwB,CAAC,WAAW,EAAE,WAAW,EAAE,aAAa,GAAE,aAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAmF3F,SAAS,CAAC,gCAAgC,CAAC,eAAe,EAAE,cAAc,EAAE;CAiC7E"}
|
|
@@ -60,7 +60,10 @@ class BaseSchemaFormatter {
|
|
|
60
60
|
return !!name.match(/^[a-z0-9_]+$/i);
|
|
61
61
|
}
|
|
62
62
|
schemaDescriptorForTable(tableSchema, schemaContext = {}) {
|
|
63
|
-
|
|
63
|
+
let table = `${tableSchema.schema?.length ? `${this.escapeName(tableSchema.schema)}.` : ''}${this.escapeName(tableSchema.table)}`;
|
|
64
|
+
if (this.options.catalog) {
|
|
65
|
+
table = `${this.escapeName(this.options.catalog)}.${table}`;
|
|
66
|
+
}
|
|
64
67
|
const { dataSource, ...contextProps } = schemaContext;
|
|
65
68
|
let dataSourceProp = {};
|
|
66
69
|
if (dataSource) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseSchemaFormatter.js","sourceRoot":"","sources":["../../../../src/scaffolding/formatters/BaseSchemaFormatter.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAoC;AAEpC,4DAO8B;AAC9B,wEAAqE;AACrE,oCAAuC;AAEvC,MAAM,qBAAqB,GAAG;IAC5B,MAAM,EAAE,YAAY;IACpB,OAAO,EAAE,aAAa;IACtB,SAAS,EAAE,aAAa;CACzB,CAAC;
|
|
1
|
+
{"version":3,"file":"BaseSchemaFormatter.js","sourceRoot":"","sources":["../../../../src/scaffolding/formatters/BaseSchemaFormatter.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.33.
|
|
5
|
+
"version": "0.33.43",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
8
8
|
"url": "https://github.com/cube-js/cube.git",
|
|
@@ -40,8 +40,8 @@
|
|
|
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.33.
|
|
44
|
-
"@cubejs-backend/shared": "^0.33.
|
|
43
|
+
"@cubejs-backend/native": "^0.33.43",
|
|
44
|
+
"@cubejs-backend/shared": "^0.33.43",
|
|
45
45
|
"antlr4ts": "0.5.0-alpha.4",
|
|
46
46
|
"camelcase": "^6.2.0",
|
|
47
47
|
"cron-parser": "^3.5.0",
|
|
@@ -59,7 +59,7 @@
|
|
|
59
59
|
"devDependencies": {
|
|
60
60
|
"@apla/clickhouse": "^1.5.5",
|
|
61
61
|
"@cubejs-backend/linter": "^0.33.0",
|
|
62
|
-
"@cubejs-backend/query-orchestrator": "^0.33.
|
|
62
|
+
"@cubejs-backend/query-orchestrator": "^0.33.43",
|
|
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",
|
|
@@ -101,5 +101,5 @@
|
|
|
101
101
|
".*\\.d\\.ts"
|
|
102
102
|
]
|
|
103
103
|
},
|
|
104
|
-
"gitHead": "
|
|
104
|
+
"gitHead": "60e05a0e84418e47d4fb826cc211c84dc86f2629"
|
|
105
105
|
}
|