@cubejs-backend/schema-compiler 1.5.0 → 1.5.1
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.
|
@@ -6,8 +6,8 @@ export declare class ClickHouseQuery extends BaseQuery {
|
|
|
6
6
|
convertTz(field: any): string;
|
|
7
7
|
timeGroupedColumn(granularity: any, dimension: any): string;
|
|
8
8
|
/**
|
|
9
|
-
* Returns
|
|
10
|
-
* intervals relative to origin timestamp point.
|
|
9
|
+
* Returns SQL for source expression floored to timestamps aligned with
|
|
10
|
+
* intervals relative to the origin timestamp point.
|
|
11
11
|
*/
|
|
12
12
|
dateBin(interval: string, source: string, origin: string): string;
|
|
13
13
|
subtractInterval(date: string, interval: string): string;
|
|
@@ -19,7 +19,7 @@ export declare class ClickHouseQuery extends BaseQuery {
|
|
|
19
19
|
*/
|
|
20
20
|
private formatInterval;
|
|
21
21
|
timeStampCast(value: string): string;
|
|
22
|
-
dateTimeCast(value: string): string;
|
|
22
|
+
dateTimeCast(value: string, timezone?: string): string;
|
|
23
23
|
dimensionsJoinCondition(leftAlias: any, rightAlias: any): string;
|
|
24
24
|
orderHashToString(hash: {
|
|
25
25
|
id: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClickHouseQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/ClickHouseQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AA4BxD,qBAAa,eAAgB,SAAQ,SAAS;IACrC,SAAS,CAAC,MAAM,KAAA;IAIhB,gBAAgB,CAAC,IAAI,KAAA;IAIrB,SAAS,CAAC,KAAK,KAAA;IAWf,iBAAiB,CAAC,WAAW,KAAA,EAAE,SAAS,KAAA;IAY/C;;;OAGG;IACI,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;
|
|
1
|
+
{"version":3,"file":"ClickHouseQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/ClickHouseQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AA4BxD,qBAAa,eAAgB,SAAQ,SAAS;IACrC,SAAS,CAAC,MAAM,KAAA;IAIhB,gBAAgB,CAAC,IAAI,KAAA;IAIrB,SAAS,CAAC,KAAK,KAAA;IAWf,iBAAiB,CAAC,WAAW,KAAA,EAAE,SAAS,KAAA;IAY/C;;;OAGG;IACI,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAiBjE,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAIxD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAI1D;;;;OAIG;IACH,OAAO,CAAC,cAAc;IAQf,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAIpC,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM;IActD,uBAAuB,CAAC,SAAS,KAAA,EAAE,UAAU,KAAA;IAUpC,iBAAiB,CAAC,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE;IAmB9D,aAAa;IAYb,eAAe,CAAC,QAAQ,KAAA,EAAE,QAAQ,KAAA;IAYlC,YAAY,CAAC,GAAG,KAAA;IAIhB,SAAS,CAAC,aAAa,EAAE,iBAAiB;IA2C1C,gBAAgB,CAAC,OAAO,KAAA;IAKxB,gBAAgB;IAIhB,qBAAqB,CAAC,IAAI,KAAA,EAAE,cAAc,KAAA,EAAE,SAAS,KAAA;IAUrD,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIxC,cAAc,CAAC,SAAS,KAAA,EAAE,SAAS,KAAA,EAAE,cAAc,KAAA;IAInD,gBAAgB,CAAC,SAAS,KAAA;IAW1B,YAAY;CAkBpB"}
|
|
@@ -58,19 +58,22 @@ class ClickHouseQuery extends BaseQuery_1.BaseQuery {
|
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
60
|
/**
|
|
61
|
-
* Returns
|
|
62
|
-
* intervals relative to origin timestamp point.
|
|
61
|
+
* Returns SQL for source expression floored to timestamps aligned with
|
|
62
|
+
* intervals relative to the origin timestamp point.
|
|
63
63
|
*/
|
|
64
64
|
dateBin(interval, source, origin) {
|
|
65
|
+
// Pass timezone to dateTimeCast to ensure origin is in the same timezone as a source, because ClickHouse aligns
|
|
66
|
+
// both timestamps internally to the same timezone before computing the difference, causing an unintended offset.
|
|
67
|
+
const alignedOrigin = this.dateTimeCast(`'${origin}'`, this.timezone);
|
|
65
68
|
const intervalFormatted = this.formatInterval(interval);
|
|
66
69
|
const timeUnit = this.diffTimeUnitForInterval(interval);
|
|
67
70
|
const beginOfTime = 'fromUnixTimestamp(0)';
|
|
68
71
|
return `date_add(${timeUnit},
|
|
69
72
|
FLOOR(
|
|
70
|
-
date_diff(${timeUnit}, ${
|
|
73
|
+
date_diff(${timeUnit}, ${alignedOrigin}, ${source}) /
|
|
71
74
|
date_diff(${timeUnit}, ${beginOfTime}, ${beginOfTime} + ${intervalFormatted})
|
|
72
75
|
) * date_diff(${timeUnit}, ${beginOfTime}, ${beginOfTime} + ${intervalFormatted}),
|
|
73
|
-
${
|
|
76
|
+
${alignedOrigin}
|
|
74
77
|
)`;
|
|
75
78
|
}
|
|
76
79
|
subtractInterval(date, interval) {
|
|
@@ -93,11 +96,16 @@ class ClickHouseQuery extends BaseQuery_1.BaseQuery {
|
|
|
93
96
|
timeStampCast(value) {
|
|
94
97
|
return this.dateTimeCast(value);
|
|
95
98
|
}
|
|
96
|
-
dateTimeCast(value) {
|
|
99
|
+
dateTimeCast(value, timezone) {
|
|
100
|
+
// This is critical for custom granularity, because timezone should be aligned between origin and source column, otherwise
|
|
101
|
+
// clickhouse will align the source column to the origin timezone, which will cause an unintended offset.
|
|
102
|
+
if (timezone) {
|
|
103
|
+
// Use precision 3 for milliseconds to match the format 'YYYY-MM-DDTHH:mm:ss.SSS'
|
|
104
|
+
return `toDateTime64(${value}, 3, '${timezone}')`;
|
|
105
|
+
}
|
|
97
106
|
// value yields a string formatted in ISO8601, so this function returns a expression to parse a string to a DateTime
|
|
98
107
|
// ClickHouse provides toDateTime which expects dates in UTC in format YYYY-MM-DD HH:MM:SS
|
|
99
108
|
// However parseDateTimeBestEffort works with ISO8601
|
|
100
|
-
//
|
|
101
109
|
return `parseDateTimeBestEffort(${value})`;
|
|
102
110
|
}
|
|
103
111
|
dimensionsJoinCondition(leftAlias, rightAlias) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClickHouseQuery.js","sourceRoot":"","sources":["../../../src/adapter/ClickHouseQuery.ts"],"names":[],"mappings":";;;AAAA,mDAA0D;AAC1D,2CAAwC;AACxC,6CAA0C;AAC1C,qDAAkD;AAGlD,MAAM,uBAAuB,GAAG;IAC9B,GAAG,EAAE,KAAK;IACV,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,KAAK,EAAE,OAAO;IACd,OAAO,EAAE,SAAS;IAClB,IAAI,EAAE,MAAM;CACb,CAAC;AAEF,MAAM,gBAAiB,SAAQ,uBAAU;IAChC,cAAc,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI;QAC5C,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,IAAI,KAAK,UAAU,IAAI,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACvE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,IAAI,KAAK,UAAU,IAAI,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACzE,OAAO,GAAG,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,kBAAkB,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC;IACpG,CAAC;IAEM,aAAa;QAClB,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC,IAAI,KAAK,QAAQ,EAAE;YACvD,mDAAmD;YACnD,OAAO,cAAc,CAAC;SACvB;QACD,OAAO,GAAG,CAAC;IACb,CAAC;CACF;AAED,MAAa,eAAgB,SAAQ,qBAAS;IACrC,SAAS,CAAC,MAAM;QACrB,OAAO,IAAI,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC5C,CAAC;IAEM,gBAAgB,CAAC,IAAI;QAC1B,OAAO,KAAK,IAAI,IAAI,CAAC;IACvB,CAAC;IAEM,SAAS,CAAC,KAAK;QACpB,EAAE;QACF,8FAA8F;QAC9F,EAAE;QACF,yDAAyD;QACzD,kFAAkF;QAClF,EAAE;QACF,EAAE;QACF,OAAO,2BAA2B,KAAK,UAAU,IAAI,CAAC,QAAQ,IAAI,CAAC;IACrE,CAAC;IAEM,iBAAiB,CAAC,WAAW,EAAE,SAAS;QAC7C,IAAI,WAAW,KAAK,MAAM,EAAE;YAC1B,OAAO,yBAAyB,SAAS,MAAM,IAAI,CAAC,QAAQ,WAAW,IAAI,CAAC,QAAQ,IAAI,CAAC;SAC1F;aAAM;YACL,MAAM,QAAQ,GAAG,uBAAuB,CAAC,WAAW,CAAC,CAAC;YACtD,MAAM,YAAY,GAAG,gBAAgB,SAAS,SAAS,IAAI,CAAC,QAAQ,IAAI,CAAC;YACzE,MAAM,iBAAiB,GAAG,YAAY,QAAQ,IAAI,SAAS,MAAM,IAAI,CAAC,QAAQ,IAAI,CAAC;YACnF,MAAM,kBAAkB,GAAG,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,iBAAiB,CAAC;YACvF,OAAO,gBAAgB,kBAAkB,SAAS,IAAI,CAAC,QAAQ,IAAI,CAAC;SACrE;IACH,CAAC;IAED;;;OAGG;IACI,OAAO,CAAC,QAAgB,EAAE,MAAc,EAAE,MAAc;QAC7D,MAAM,iBAAiB,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QACxD,MAAM,QAAQ,GAAG,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC;QACxD,MAAM,WAAW,GAAG,sBAAsB,CAAC;QAE3C,OAAO,YAAY,QAAQ;;sBAET,QAAQ,KAAK,
|
|
1
|
+
{"version":3,"file":"ClickHouseQuery.js","sourceRoot":"","sources":["../../../src/adapter/ClickHouseQuery.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.5.
|
|
5
|
+
"version": "1.5.1",
|
|
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.5.
|
|
44
|
-
"@cubejs-backend/shared": "1.5.
|
|
43
|
+
"@cubejs-backend/native": "1.5.1",
|
|
44
|
+
"@cubejs-backend/shared": "1.5.1",
|
|
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.5.
|
|
64
|
-
"@cubejs-backend/query-orchestrator": "1.5.
|
|
63
|
+
"@cubejs-backend/linter": "1.5.1",
|
|
64
|
+
"@cubejs-backend/query-orchestrator": "1.5.1",
|
|
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",
|
|
@@ -75,6 +75,7 @@
|
|
|
75
75
|
"@types/syntax-error": "^1.4.1",
|
|
76
76
|
"@types/uuid": "^8.3.0",
|
|
77
77
|
"jest": "^29",
|
|
78
|
+
"moment": "^2.30.1",
|
|
78
79
|
"mssql": "^10.0.2",
|
|
79
80
|
"mysql": "^2.18.1",
|
|
80
81
|
"node-fetch": "2",
|
|
@@ -88,5 +89,5 @@
|
|
|
88
89
|
"eslintConfig": {
|
|
89
90
|
"extends": "../cubejs-linter"
|
|
90
91
|
},
|
|
91
|
-
"gitHead": "
|
|
92
|
+
"gitHead": "e9dce761a6256038acf53d8875f2cd19f810032e"
|
|
92
93
|
}
|