@cubejs-backend/schema-compiler 1.6.6 → 1.6.7
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/ClickHouseQuery.js +3 -3
- package/dist/src/adapter/MssqlQuery.d.ts +3 -3
- package/dist/src/adapter/MssqlQuery.d.ts.map +1 -1
- package/dist/src/adapter/MssqlQuery.js +44 -6
- package/dist/src/adapter/MssqlQuery.js.map +1 -1
- package/dist/src/compiler/ErrorReporter.d.ts +2 -1
- package/dist/src/compiler/ErrorReporter.d.ts.map +1 -1
- package/dist/src/compiler/ErrorReporter.js +5 -5
- package/dist/src/compiler/ErrorReporter.js.map +1 -1
- package/package.json +6 -6
|
@@ -64,16 +64,16 @@ class ClickHouseQuery extends BaseQuery_1.BaseQuery {
|
|
|
64
64
|
dateBin(interval, source, origin) {
|
|
65
65
|
// Pass timezone to dateTimeCast to ensure origin is in the same timezone as a source, because ClickHouse aligns
|
|
66
66
|
// both timestamps internally to the same timezone before computing the difference, causing an unintended offset.
|
|
67
|
-
const
|
|
67
|
+
const originAligned = this.dateTimeCast(`'${origin}'`, this.timezone);
|
|
68
68
|
const intervalFormatted = this.formatInterval(interval);
|
|
69
69
|
const timeUnit = this.diffTimeUnitForInterval(interval);
|
|
70
70
|
const beginOfTime = 'fromUnixTimestamp(0)';
|
|
71
71
|
return `date_add(${timeUnit},
|
|
72
72
|
FLOOR(
|
|
73
|
-
date_diff(${timeUnit}, ${
|
|
73
|
+
date_diff(${timeUnit}, ${originAligned}, ${source}) /
|
|
74
74
|
date_diff(${timeUnit}, ${beginOfTime}, ${beginOfTime} + ${intervalFormatted})
|
|
75
75
|
) * date_diff(${timeUnit}, ${beginOfTime}, ${beginOfTime} + ${intervalFormatted}),
|
|
76
|
-
${
|
|
76
|
+
${originAligned}
|
|
77
77
|
)`;
|
|
78
78
|
}
|
|
79
79
|
subtractInterval(date, interval) {
|
|
@@ -14,9 +14,9 @@ export declare class MssqlQuery extends BaseQuery {
|
|
|
14
14
|
dateTimeCast(value: string): string;
|
|
15
15
|
timeGroupedColumn(granularity: string, dimension: string): string;
|
|
16
16
|
/**
|
|
17
|
-
* Returns
|
|
18
|
-
* intervals relative to origin timestamp point.
|
|
19
|
-
* The formula operates with seconds diffs so it won't produce human-expected dates aligned with offset date parts.
|
|
17
|
+
* Returns SQL for source expression floored to timestamps aligned with
|
|
18
|
+
* intervals relative to the origin timestamp point.
|
|
19
|
+
* The formula operates with seconds diffs, so it won't produce human-expected dates aligned with offset date parts.
|
|
20
20
|
*/
|
|
21
21
|
dateBin(interval: string, source: string, origin: string): string;
|
|
22
22
|
newParamAllocator(expressionParams: any): MssqlParamAllocator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MssqlQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/MssqlQuery.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAmBlD,cAAM,mBAAoB,SAAQ,cAAc;IACvC,gBAAgB,CAAC,UAAU,KAAA;CAGnC;AA4CD,qBAAa,UAAW,SAAQ,SAAS;IAChC,SAAS,CAAC,MAAM,KAAA;IAIhB,UAAU,CAAC,OAAO,KAAA,GAAG,WAAW;IAIhC,YAAY,CAAC,GAAG,KAAA;IAIhB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE;IAIlC,SAAS,CAAC,KAAK,KAAA;
|
|
1
|
+
{"version":3,"file":"MssqlQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/MssqlQuery.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAmBlD,cAAM,mBAAoB,SAAQ,cAAc;IACvC,gBAAgB,CAAC,UAAU,KAAA;CAGnC;AA4CD,qBAAa,UAAW,SAAQ,SAAS;IAChC,SAAS,CAAC,MAAM,KAAA;IAIhB,UAAU,CAAC,OAAO,KAAA,GAAG,WAAW;IAIhC,YAAY,CAAC,GAAG,KAAA;IAIhB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE;IAIlC,SAAS,CAAC,KAAK,KAAA;IASf,aAAa,CAAC,KAAK,EAAE,MAAM;IAI3B,YAAY,CAAC,KAAK,EAAE,MAAM;IAI1B,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM;IAIxE;;;;OAIG;IACI,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAiBjE,iBAAiB,CAAC,gBAAgB,KAAA;IAKlC,qBAAqB;IAQrB,QAAQ;IAOf;;;;;;OAMG;IACI,aAAa;IAWpB;;;;;OAKG;IACI,8BAA8B;IAK9B,oBAAoB,CAAC,kBAAkB,KAAA,EAAE,aAAa,KAAA,EAAE,SAAS,KAAA,EAAE,oBAAoB,KAAA,EAAE,cAAc,KAAA;IAsBvG,eAAe;IAIf,gBAAgB;IAKhB,qBAAqB,CAAC,IAAI,KAAA,EAAE,cAAc,KAAA,EAAE,SAAS,KAAA;IAKrD,6BAA6B,CAAC,GAAG,KAAA;IAIjC,SAAS,CAAC,aAAa,KAAA;IAOvB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAWxD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAWnD,YAAY;CAoDpB"}
|
|
@@ -81,7 +81,11 @@ class MssqlQuery extends BaseQuery_1.BaseQuery {
|
|
|
81
81
|
return strings.join(' + ');
|
|
82
82
|
}
|
|
83
83
|
convertTz(field) {
|
|
84
|
-
|
|
84
|
+
const offset = (0, moment_timezone_1.default)().tz(this.timezone).format('Z');
|
|
85
|
+
// 1. Treating the field as UTC (add '+00:00' offset)
|
|
86
|
+
// 2. Switch to target timezone offset
|
|
87
|
+
// 3. Cast to DATETIME2 to get naive timestamp in target timezone
|
|
88
|
+
return `CAST(SWITCHOFFSET(TODATETIMEOFFSET(${field}, '+00:00'), '${offset}') AS DATETIME2)`;
|
|
85
89
|
}
|
|
86
90
|
timeStampCast(value) {
|
|
87
91
|
return `CAST(${value} AS DATETIMEOFFSET)`;
|
|
@@ -93,20 +97,23 @@ class MssqlQuery extends BaseQuery_1.BaseQuery {
|
|
|
93
97
|
return GRANULARITY_TO_INTERVAL[granularity](dimension);
|
|
94
98
|
}
|
|
95
99
|
/**
|
|
96
|
-
* Returns
|
|
97
|
-
* intervals relative to origin timestamp point.
|
|
98
|
-
* The formula operates with seconds diffs so it won't produce human-expected dates aligned with offset date parts.
|
|
100
|
+
* Returns SQL for source expression floored to timestamps aligned with
|
|
101
|
+
* intervals relative to the origin timestamp point.
|
|
102
|
+
* The formula operates with seconds diffs, so it won't produce human-expected dates aligned with offset date parts.
|
|
99
103
|
*/
|
|
100
104
|
dateBin(interval, source, origin) {
|
|
105
|
+
// Both source and origin are now DATETIME2 in the query timezone (naive timestamps),
|
|
106
|
+
// ensuring their in the same timezone context for correct date bin calculation.
|
|
107
|
+
const originAligned = this.dateTimeCast(`'${origin}'`);
|
|
101
108
|
const beginOfTime = this.dateTimeCast('DATEFROMPARTS(1970, 1, 1)');
|
|
102
109
|
const timeUnit = this.diffTimeUnitForInterval(interval);
|
|
103
110
|
// Need to explicitly cast one argument of floor to float to trigger correct sign logic
|
|
104
111
|
return `DATEADD(${timeUnit},
|
|
105
112
|
FLOOR(
|
|
106
|
-
CAST(DATEDIFF(${timeUnit}, ${
|
|
113
|
+
CAST(DATEDIFF(${timeUnit}, ${originAligned}, ${source}) AS FLOAT) /
|
|
107
114
|
DATEDIFF(${timeUnit}, ${beginOfTime}, ${this.addInterval(beginOfTime, interval)})
|
|
108
115
|
) * DATEDIFF(${timeUnit}, ${beginOfTime}, ${this.addInterval(beginOfTime, interval)}),
|
|
109
|
-
${
|
|
116
|
+
${originAligned}
|
|
110
117
|
)`;
|
|
111
118
|
}
|
|
112
119
|
newParamAllocator(expressionParams) {
|
|
@@ -217,6 +224,37 @@ class MssqlQuery extends BaseQuery_1.BaseQuery {
|
|
|
217
224
|
templates.types.timestamp = 'DATETIME2';
|
|
218
225
|
delete templates.types.interval;
|
|
219
226
|
templates.types.binary = 'VARBINARY';
|
|
227
|
+
templates.params.param = '@_{{ param_index + 1 }}';
|
|
228
|
+
// MSSQL does not support ordinal GROUP BY (GROUP BY 1, 2), must use expressions
|
|
229
|
+
templates.statements.group_by_exprs = '{{ group_by | map(attribute=\'expr\') | join(\', \') }}';
|
|
230
|
+
// MSSQL does not support ordinal ORDER BY (ORDER BY 1, 2), must use expressions
|
|
231
|
+
templates.expressions.order_by = '{{ expr }} {% if asc %}ASC{% else %}DESC{% endif %}';
|
|
232
|
+
// MSSQL uses CAST(...AS DATETIME2) instead of ::timestamp
|
|
233
|
+
templates.statements.time_series_select = 'SELECT CAST(date_from AS DATETIME2) AS "date_from",\n' +
|
|
234
|
+
'CAST(date_to AS DATETIME2) AS "date_to" \n' +
|
|
235
|
+
'FROM(\n' +
|
|
236
|
+
' VALUES ' +
|
|
237
|
+
'{% for time_item in seria %}' +
|
|
238
|
+
'(\'{{ time_item[0] }}\', \'{{ time_item[1] }}\')' +
|
|
239
|
+
'{% if not loop.last %}, {% endif %}' +
|
|
240
|
+
'{% endfor %}' +
|
|
241
|
+
') AS dates (date_from, date_to)';
|
|
242
|
+
// MSSQL uses OFFSET/FETCH instead of LIMIT/OFFSET
|
|
243
|
+
templates.statements.select = '{% if ctes %} WITH \n' +
|
|
244
|
+
'{{ ctes | join(\',\n\') }}\n' +
|
|
245
|
+
'{% endif %}' +
|
|
246
|
+
'SELECT {% if distinct %}DISTINCT {% endif %}' +
|
|
247
|
+
'{{ select_concat | map(attribute=\'aliased\') | join(\', \') }} {% if from %}\n' +
|
|
248
|
+
'FROM (\n' +
|
|
249
|
+
'{{ from | indent(2, true) }}\n' +
|
|
250
|
+
') AS {{ from_alias }}{% elif from_prepared %}\n' +
|
|
251
|
+
'FROM {{ from_prepared }}' +
|
|
252
|
+
'{% endif %}' +
|
|
253
|
+
'{% if filter %}\nWHERE {{ filter }}{% endif %}' +
|
|
254
|
+
'{% if group_by %}\nGROUP BY {{ group_by }}{% endif %}' +
|
|
255
|
+
'{% if having %}\nHAVING {{ having }}{% endif %}' +
|
|
256
|
+
'{% if order_by %}\nORDER BY {{ order_by | map(attribute=\'expr\') | join(\', \') }}\nOFFSET {% if offset is not none %}{{ offset }}{% else %}0{% endif %} ROWS{% endif %}' +
|
|
257
|
+
'{% if limit is not none %}\nFETCH NEXT {{ limit }} ROWS ONLY{% endif %}';
|
|
220
258
|
return templates;
|
|
221
259
|
}
|
|
222
260
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MssqlQuery.js","sourceRoot":"","sources":["../../../src/adapter/MssqlQuery.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"MssqlQuery.js","sourceRoot":"","sources":["../../../src/adapter/MssqlQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { SourceLocation } from '@babel/code-frame';
|
|
2
|
+
import { LoggerFn } from '@cubejs-backend/shared';
|
|
2
3
|
import { UserError } from './UserError';
|
|
3
4
|
export type ErrorLikeObject = {
|
|
4
5
|
message: string;
|
|
@@ -22,7 +23,7 @@ interface File {
|
|
|
22
23
|
content: string;
|
|
23
24
|
}
|
|
24
25
|
export interface ErrorReporterOptions {
|
|
25
|
-
logger:
|
|
26
|
+
logger: LoggerFn;
|
|
26
27
|
}
|
|
27
28
|
export declare class ErrorReporter {
|
|
28
29
|
protected readonly parent: ErrorReporter | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ErrorReporter.d.ts","sourceRoot":"","sources":["../../../src/compiler/ErrorReporter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,cAAc,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"ErrorReporter.d.ts","sourceRoot":"","sources":["../../../src/compiler/ErrorReporter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAElD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,KAAK,GAAG,SAAS,GAAG,MAAM,GAAG,eAAe,CAAC;AAEzE,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,GAAG,CAAC,EAAE,cAAc,GAAG,IAAI,GAAG,SAAS,CAAC;IACxC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,IAAI;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,QAAQ,CAAA;CACjB;AAID,qBAAa,aAAa;IAQtB,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI;IAC/C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE;IACjC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,oBAAoB;IATlD,SAAS,CAAC,QAAQ,EAAE,oBAAoB,EAAE,CAAM;IAEhD,SAAS,CAAC,MAAM,EAAE,sBAAsB,EAAE,CAAM;IAEhD,SAAS,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAAQ;gBAGd,MAAM,GAAE,aAAa,GAAG,IAAW,EACnC,OAAO,GAAE,GAAG,EAAO,EACnB,OAAO,GAAE,oBAE3B;IAII,QAAQ;IAIR,MAAM,CAAC,IAAI,EAAE,IAAI;IAIjB,OAAO,CAAC,CAAC,EAAE,oBAAoB,EAAE,QAAQ,CAAC,EAAE,MAAM;IA6ClD,WAAW,CAAC,CAAC,EAAE,oBAAoB,EAAE,QAAQ,CAAC,EAAE,MAAM;IAgCtD,KAAK,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,GAAG,EAAE,UAAU,CAAC,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,GAAG;IAe9D,SAAS,CAAC,OAAO,EAAE,MAAM;IAIhC,OAAO,CAAC,WAAW;IAgBZ,UAAU;IA6CV,SAAS;IAIT,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM;IAIpD,WAAW;IAIX,WAAW,CAAC,QAAQ,EAAE,oBAAoB,EAAE;IAInD,SAAS,CAAC,YAAY,IAAI,aAAa;CAGxC"}
|
|
@@ -12,7 +12,7 @@ class ErrorReporter {
|
|
|
12
12
|
errors = [];
|
|
13
13
|
file = null;
|
|
14
14
|
constructor(parent = null, context = [], options = {
|
|
15
|
-
logger: (msg) => console.log(msg),
|
|
15
|
+
logger: (msg, _params) => console.log(msg),
|
|
16
16
|
}) {
|
|
17
17
|
this.parent = parent;
|
|
18
18
|
this.context = context;
|
|
@@ -43,10 +43,10 @@ class ErrorReporter {
|
|
|
43
43
|
fileName: targetFileName,
|
|
44
44
|
});
|
|
45
45
|
if (targetFileName) {
|
|
46
|
-
this.options.logger(`${targetFileName}:\n${message}
|
|
46
|
+
this.options.logger(`${targetFileName}:\n${message}`, {});
|
|
47
47
|
}
|
|
48
48
|
else {
|
|
49
|
-
this.options.logger(message);
|
|
49
|
+
this.options.logger(message, {});
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
52
|
else {
|
|
@@ -58,10 +58,10 @@ class ErrorReporter {
|
|
|
58
58
|
fileName: targetFileName,
|
|
59
59
|
});
|
|
60
60
|
if (targetFileName) {
|
|
61
|
-
this.options.logger(`${targetFileName}:\n${e.message}
|
|
61
|
+
this.options.logger(`${targetFileName}:\n${e.message}`, {});
|
|
62
62
|
}
|
|
63
63
|
else {
|
|
64
|
-
this.options.logger(e.message);
|
|
64
|
+
this.options.logger(e.message, {});
|
|
65
65
|
}
|
|
66
66
|
}
|
|
67
67
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ErrorReporter.js","sourceRoot":"","sources":["../../../src/compiler/ErrorReporter.ts"],"names":[],"mappings":";;;AAAA,kDAAqE;
|
|
1
|
+
{"version":3,"file":"ErrorReporter.js","sourceRoot":"","sources":["../../../src/compiler/ErrorReporter.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": "1.6.
|
|
5
|
+
"version": "1.6.7",
|
|
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.24",
|
|
41
41
|
"@babel/traverse": "^7.24",
|
|
42
42
|
"@babel/types": "^7.24",
|
|
43
|
-
"@cubejs-backend/native": "1.6.
|
|
44
|
-
"@cubejs-backend/shared": "1.6.
|
|
43
|
+
"@cubejs-backend/native": "1.6.7",
|
|
44
|
+
"@cubejs-backend/shared": "1.6.7",
|
|
45
45
|
"antlr4": "^4.13.2",
|
|
46
46
|
"camelcase": "^6.2.0",
|
|
47
47
|
"cron-parser": "^4.9.0",
|
|
@@ -60,8 +60,8 @@
|
|
|
60
60
|
},
|
|
61
61
|
"devDependencies": {
|
|
62
62
|
"@clickhouse/client": "^1.12.0",
|
|
63
|
-
"@cubejs-backend/linter": "1.6.
|
|
64
|
-
"@cubejs-backend/query-orchestrator": "1.6.
|
|
63
|
+
"@cubejs-backend/linter": "1.6.7",
|
|
64
|
+
"@cubejs-backend/query-orchestrator": "1.6.7",
|
|
65
65
|
"@types/babel__code-frame": "^7.0.6",
|
|
66
66
|
"@types/babel__generator": "^7.6.8",
|
|
67
67
|
"@types/babel__traverse": "^7.20.5",
|
|
@@ -89,5 +89,5 @@
|
|
|
89
89
|
"eslintConfig": {
|
|
90
90
|
"extends": "../cubejs-linter"
|
|
91
91
|
},
|
|
92
|
-
"gitHead": "
|
|
92
|
+
"gitHead": "150299caffda968d07347b89d8eba091748b495a"
|
|
93
93
|
}
|