@cubejs-backend/questdb-driver 1.6.52 → 1.6.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/dist/src/QuestQuery.d.ts
CHANGED
|
@@ -11,6 +11,7 @@ export declare class QuestQuery extends BaseQuery {
|
|
|
11
11
|
unixTimestampSql(): string;
|
|
12
12
|
timeGroupedColumn(granularity: string, dimension: string): string;
|
|
13
13
|
dimensionsJoinCondition(leftAlias: string, rightAlias: string): string;
|
|
14
|
+
baseHaving(query: string, filters: BaseFilter[]): string;
|
|
14
15
|
renderSqlMeasure(name: string, evaluateSql: string, symbol: any, cubeName: string, parentMeasure: string, orderBySql: string[]): string;
|
|
15
16
|
primaryKeyCount(cubeName: string, distinct: boolean): string;
|
|
16
17
|
orderHashToString(hash: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QuestQuery.d.ts","sourceRoot":"","sources":["../../src/QuestQuery.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"QuestQuery.d.ts","sourceRoot":"","sources":["../../src/QuestQuery.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EACV,SAAS,EACT,cAAc,EACf,MAAM,iCAAiC,CAAC;AA+BzC,qBAAa,UAAW,SAAQ,SAAS;IAChC,SAAS,CAAC,MAAM,EAAE,GAAG,GAAG,UAAU;IAIlC,iBAAiB,IAAI,cAAc;IAInC,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM;IAI3C,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAIhC,aAAa,CAAC,KAAK,EAAE,MAAM;IAI3B,YAAY,CAAC,KAAK,EAAE,MAAM;IAI1B,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAKxD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAKnD,gBAAgB,IAAI,MAAM;IAK1B,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM;IAQjE,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IAUtE,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE;IAe/C,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM;IAUvI,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,GAAG,MAAM;IAY5D,iBAAiB,CAAC,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE,GAAG,MAAM,GAAG,IAAI;IAsBrE,aAAa,IAAI,MAAM;CAe/B"}
|
package/dist/src/QuestQuery.js
CHANGED
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.QuestQuery = void 0;
|
|
7
|
+
const ramda_1 = __importDefault(require("ramda"));
|
|
4
8
|
const schema_compiler_1 = require("@cubejs-backend/schema-compiler");
|
|
5
9
|
const GRANULARITY_TO_INTERVAL = {
|
|
6
10
|
second: 's',
|
|
@@ -73,6 +77,19 @@ class QuestQuery extends schema_compiler_1.BaseQuery {
|
|
|
73
77
|
.map(alias => `(${leftAlias}.${alias} = ${rightAlias}.${alias} OR (${leftAlias}.${alias} = NULL AND ${rightAlias}.${alias} = NULL))`)
|
|
74
78
|
.join(' AND ');
|
|
75
79
|
}
|
|
80
|
+
baseHaving(query, filters) {
|
|
81
|
+
// QuestDB doesn't support HAVING syntax.
|
|
82
|
+
// `( <query> ) WHERE <filter>` should be used instead.
|
|
83
|
+
if (filters.length > 0) {
|
|
84
|
+
let filter = filters.map(t => t.filterToWhere()).filter(ramda_1.default.identity).map(f => `(${f})`).join(' AND ');
|
|
85
|
+
// Replace measures with their aliases in the filter.
|
|
86
|
+
this.measures.forEach((m) => {
|
|
87
|
+
filter = filter.replace(m.measureSql(), m.aliasName());
|
|
88
|
+
});
|
|
89
|
+
return `SELECT * FROM (${query}) WHERE ${filter}`;
|
|
90
|
+
}
|
|
91
|
+
return query;
|
|
92
|
+
}
|
|
76
93
|
renderSqlMeasure(name, evaluateSql, symbol, cubeName, parentMeasure, orderBySql) {
|
|
77
94
|
// QuestDB doesn't support COUNT(column_name) syntax.
|
|
78
95
|
// COUNT() or COUNT(*) should be used instead.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QuestQuery.js","sourceRoot":"","sources":["../../src/QuestQuery.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"QuestQuery.js","sourceRoot":"","sources":["../../src/QuestQuery.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@cubejs-backend/questdb-driver",
|
|
3
3
|
"description": "Cube.js QuestDB database driver",
|
|
4
4
|
"author": "Cube Dev, Inc.",
|
|
5
|
-
"version": "1.6.
|
|
5
|
+
"version": "1.6.54",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
8
8
|
"url": "https://github.com/cube-js/cube.git",
|
|
@@ -27,9 +27,9 @@
|
|
|
27
27
|
"lint:fix": "eslint --fix src/* --ext .ts"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@cubejs-backend/base-driver": "1.6.
|
|
31
|
-
"@cubejs-backend/schema-compiler": "1.6.
|
|
32
|
-
"@cubejs-backend/shared": "1.6.
|
|
30
|
+
"@cubejs-backend/base-driver": "1.6.54",
|
|
31
|
+
"@cubejs-backend/schema-compiler": "1.6.54",
|
|
32
|
+
"@cubejs-backend/shared": "1.6.54",
|
|
33
33
|
"@types/pg": "^8.6.0",
|
|
34
34
|
"moment": "^2.24.0",
|
|
35
35
|
"pg": "^8.7.0",
|
|
@@ -37,8 +37,8 @@
|
|
|
37
37
|
},
|
|
38
38
|
"license": "Apache-2.0",
|
|
39
39
|
"devDependencies": {
|
|
40
|
-
"@cubejs-backend/linter": "1.6.
|
|
41
|
-
"@cubejs-backend/testing-shared": "1.6.
|
|
40
|
+
"@cubejs-backend/linter": "1.6.54",
|
|
41
|
+
"@cubejs-backend/testing-shared": "1.6.54",
|
|
42
42
|
"testcontainers": "^10.28.0",
|
|
43
43
|
"typescript": "~5.2.2"
|
|
44
44
|
},
|
|
@@ -51,5 +51,5 @@
|
|
|
51
51
|
"eslintConfig": {
|
|
52
52
|
"extends": "../cubejs-linter"
|
|
53
53
|
},
|
|
54
|
-
"gitHead": "
|
|
54
|
+
"gitHead": "11588e62b6493e4c61e57360ea154b67ddcbc873"
|
|
55
55
|
}
|