@cubejs-backend/materialize-driver 0.31.1 → 0.31.3
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,25 @@
|
|
|
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.31.3](https://github.com/cube-js/cube.js/compare/v0.31.2...v0.31.3) (2022-10-08)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* drivers imports alignment ([#5448](https://github.com/cube-js/cube.js/issues/5448)) ([ab12426](https://github.com/cube-js/cube.js/commit/ab1242650ba0368b855176b9c6ca2d73073acf0e))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
## [0.31.2](https://github.com/cube-js/cube.js/compare/v0.31.1...v0.31.2) (2022-10-08)
|
|
18
|
+
|
|
19
|
+
**Note:** Version bump only for package @cubejs-backend/materialize-driver
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
|
|
6
25
|
## [0.31.1](https://github.com/cube-js/cube.js/compare/v0.31.0...v0.31.1) (2022-10-04)
|
|
7
26
|
|
|
8
27
|
**Note:** Version bump only for package @cubejs-backend/materialize-driver
|
|
@@ -1,3 +1,8 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @copyright Cube Dev, Inc.
|
|
3
|
+
* @license Apache-2.0
|
|
4
|
+
* @fileoverview The `MaterializeDriver` and related types declaration.
|
|
5
|
+
*/
|
|
1
6
|
/// <reference types="node" />
|
|
2
7
|
import { PostgresDriver, PostgresDriverConfiguration } from '@cubejs-backend/postgres-driver';
|
|
3
8
|
import { DownloadTableMemoryData, IndexesSQL, StreamOptions, StreamTableDataWithTypes, TableStructure } from '@cubejs-backend/base-driver';
|
|
@@ -9,6 +14,15 @@ export declare type ReadableStreamTableDataWithTypes = StreamTableDataWithTypes
|
|
|
9
14
|
*/
|
|
10
15
|
rowStream: Readable;
|
|
11
16
|
};
|
|
17
|
+
export declare type SchemaResponse = {
|
|
18
|
+
[schema: string]: {
|
|
19
|
+
[schemaObject: string]: {
|
|
20
|
+
name: string;
|
|
21
|
+
type: string;
|
|
22
|
+
attributes: any[];
|
|
23
|
+
}[];
|
|
24
|
+
};
|
|
25
|
+
};
|
|
12
26
|
/**
|
|
13
27
|
* Materialize driver class.
|
|
14
28
|
*/
|
|
@@ -37,7 +51,13 @@ export declare class MaterializeDriver extends PostgresDriver {
|
|
|
37
51
|
* Returns materialized sources, materialized views, and tables
|
|
38
52
|
* @returns {string} schemaQuery
|
|
39
53
|
*/
|
|
40
|
-
|
|
54
|
+
informationSchemaQueryWithFilter(version: string): string;
|
|
55
|
+
/**
|
|
56
|
+
* Materialize instance version
|
|
57
|
+
* @returns {Promise<string>} version
|
|
58
|
+
*/
|
|
59
|
+
getMaterializeVersion(): Promise<string>;
|
|
60
|
+
tablesSchema(): Promise<SchemaResponse>;
|
|
41
61
|
protected asyncFetcher<R extends unknown>(conn: PoolClient, cursorId: string): AsyncGenerator<R>;
|
|
42
62
|
private releaseStream;
|
|
43
63
|
stream(query: string, values: unknown[], { highWaterMark }: StreamOptions): Promise<ReadableStreamTableDataWithTypes>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MaterializeDriver.d.ts","sourceRoot":"","sources":["../../src/MaterializeDriver.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"MaterializeDriver.d.ts","sourceRoot":"","sources":["../../src/MaterializeDriver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;;AAEH,OAAO,EAAE,cAAc,EAAE,2BAA2B,EAAE,MAAM,iCAAiC,CAAC;AAC9F,OAAO,EAAc,uBAAuB,EAAE,UAAU,EAAE,aAAa,EAAE,wBAAwB,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AACvJ,OAAO,EAAE,UAAU,EAAe,MAAM,IAAI,CAAC;AAE7C,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAGlC,oBAAY,gCAAgC,GAAG,wBAAwB,GAAG;IACxE;;OAEG;IACH,SAAS,EAAE,QAAQ,CAAC;CACrB,CAAC;AAEF,oBAAY,cAAc,GAAG;IAC3B,CAAC,MAAM,EAAE,MAAM,GAAG;QAChB,CAAC,YAAY,EAAE,MAAM,GAAG;YACtB,IAAI,EAAE,MAAM,CAAC;YACb,IAAI,EAAE,MAAM,CAAC;YACb,UAAU,EAAE,GAAG,EAAE,CAAC;SACrB,EAAE,CAAC;KACH,CAAA;CACF,CAAC;AAEF;;GAEG;AACH,qBAAa,iBAAkB,SAAQ,cAAc;IACnD;;OAEG;WACW,qBAAqB,IAAI,MAAM;IAI7C;;OAEG;gBAED,OAAO,GAAE,2BAA2B,GAAG;QACrC,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,WAAW,CAAC,EAAE,MAAM,CAAC;KACjB;cAKQ,iBAAiB,CAC/B,IAAI,EAAE,UAAU;cAMF,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrD;;;OAGG;IACU,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAU/D,sBAAsB,CACjC,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,uBAAuB,EAClC,UAAU,EAAE,UAAU;IAKxB;;;;OAIG;IACI,gCAAgC,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IA8BhE;;;OAGG;IACU,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC;IAOxC,YAAY,IAAI,OAAO,CAAC,cAAc,CAAC;cAOnC,YAAY,CAAC,CAAC,SAAS,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,GAAG,cAAc,CAAC,CAAC,CAAC;YAuBzF,aAAa;IAQd,MAAM,CACjB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,OAAO,EAAE,EACjB,EAAE,aAAa,EAAE,EAAE,aAAa,GAC/B,OAAO,CAAC,gCAAgC,CAAC;CA0B7C"}
|
|
@@ -1,9 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* @copyright Cube Dev, Inc.
|
|
4
|
+
* @license Apache-2.0
|
|
5
|
+
* @fileoverview The `MaterializeDriver` and related types declaration.
|
|
6
|
+
*/
|
|
7
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
8
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
9
|
+
};
|
|
2
10
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
11
|
exports.MaterializeDriver = void 0;
|
|
4
12
|
const postgres_driver_1 = require("@cubejs-backend/postgres-driver");
|
|
5
13
|
const base_driver_1 = require("@cubejs-backend/base-driver");
|
|
14
|
+
const ramda_1 = require("ramda");
|
|
6
15
|
const stream_1 = require("stream");
|
|
16
|
+
const semver_1 = __importDefault(require("semver"));
|
|
7
17
|
/**
|
|
8
18
|
* Materialize driver class.
|
|
9
19
|
*/
|
|
@@ -34,7 +44,7 @@ class MaterializeDriver extends postgres_driver_1.PostgresDriver {
|
|
|
34
44
|
async createSchemaIfNotExists(schemaName) {
|
|
35
45
|
const schemas = await this.query(`SHOW SCHEMAS WHERE name = '${schemaName}'`, []);
|
|
36
46
|
if (schemas.length === 0) {
|
|
37
|
-
this.query(`CREATE SCHEMA IF NOT EXISTS ${schemaName}`, []);
|
|
47
|
+
await this.query(`CREATE SCHEMA IF NOT EXISTS ${schemaName}`, []);
|
|
38
48
|
}
|
|
39
49
|
return [];
|
|
40
50
|
}
|
|
@@ -46,8 +56,9 @@ class MaterializeDriver extends postgres_driver_1.PostgresDriver {
|
|
|
46
56
|
* Returns materialized sources, materialized views, and tables
|
|
47
57
|
* @returns {string} schemaQuery
|
|
48
58
|
*/
|
|
49
|
-
|
|
50
|
-
|
|
59
|
+
informationSchemaQueryWithFilter(version) {
|
|
60
|
+
console.log(version);
|
|
61
|
+
const materializationFilter = semver_1.default.lt(version, 'v0.27.0-alpha') ? `
|
|
51
62
|
table_name IN (
|
|
52
63
|
SELECT name
|
|
53
64
|
FROM mz_catalog.mz_sources
|
|
@@ -59,9 +70,34 @@ class MaterializeDriver extends postgres_driver_1.PostgresDriver {
|
|
|
59
70
|
UNION
|
|
60
71
|
SELECT t.name
|
|
61
72
|
FROM mz_catalog.mz_tables t
|
|
62
|
-
)
|
|
73
|
+
)` : `
|
|
74
|
+
table_name IN (
|
|
75
|
+
SELECT name
|
|
76
|
+
FROM mz_catalog.mz_sources
|
|
77
|
+
UNION
|
|
78
|
+
SELECT name
|
|
79
|
+
FROM mz_catalog.mz_tables t
|
|
80
|
+
UNION
|
|
81
|
+
SELECT name
|
|
82
|
+
FROM mz_catalog.mz_materialized_views t
|
|
83
|
+
)
|
|
84
|
+
`;
|
|
63
85
|
return `${super.informationSchemaQuery()} AND ${materializationFilter}`;
|
|
64
86
|
}
|
|
87
|
+
/**
|
|
88
|
+
* Materialize instance version
|
|
89
|
+
* @returns {Promise<string>} version
|
|
90
|
+
*/
|
|
91
|
+
async getMaterializeVersion() {
|
|
92
|
+
const [{ version }] = await this.query('SELECT mz_version() as version;', []);
|
|
93
|
+
// Materialzie returns the version as follows: 'v0.24.3-alpha.5 (65778f520)'
|
|
94
|
+
return version.split(' ')[0];
|
|
95
|
+
}
|
|
96
|
+
async tablesSchema() {
|
|
97
|
+
const version = await this.getMaterializeVersion();
|
|
98
|
+
const query = this.informationSchemaQueryWithFilter(version);
|
|
99
|
+
return this.query(query, []).then(data => ramda_1.reduce(this.informationColumnsSchemaReducer, {}, data));
|
|
100
|
+
}
|
|
65
101
|
async *asyncFetcher(conn, cursorId) {
|
|
66
102
|
const timeout = `${this.config.executionTimeout ? (this.config.executionTimeout) * 1000 : 600000} milliseconds`;
|
|
67
103
|
const queryParams = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MaterializeDriver.js","sourceRoot":"","sources":["../../src/MaterializeDriver.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"MaterializeDriver.js","sourceRoot":"","sources":["../../src/MaterializeDriver.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@cubejs-backend/materialize-driver",
|
|
3
3
|
"description": "Cube.js Materialize database driver",
|
|
4
4
|
"author": "Cube Dev, Inc.",
|
|
5
|
-
"version": "0.31.
|
|
5
|
+
"version": "0.31.3",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
8
8
|
"url": "https://github.com/cube-js/cube.js.git",
|
|
@@ -27,16 +27,18 @@
|
|
|
27
27
|
"lint:fix": "eslint --fix src/* --ext .ts"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@cubejs-backend/base-driver": "^0.31.
|
|
31
|
-
"@cubejs-backend/postgres-driver": "^0.31.
|
|
30
|
+
"@cubejs-backend/base-driver": "^0.31.3",
|
|
31
|
+
"@cubejs-backend/postgres-driver": "^0.31.3",
|
|
32
32
|
"@cubejs-backend/shared": "^0.31.0",
|
|
33
33
|
"@types/pg": "^8.6.0",
|
|
34
|
-
"pg": "^8.6.0"
|
|
34
|
+
"pg": "^8.6.0",
|
|
35
|
+
"ramda": "0.27.2",
|
|
36
|
+
"semver": "7.3.7"
|
|
35
37
|
},
|
|
36
38
|
"license": "Apache-2.0",
|
|
37
39
|
"devDependencies": {
|
|
38
40
|
"@cubejs-backend/linter": "^0.31.0",
|
|
39
|
-
"@cubejs-backend/testing": "^0.31.
|
|
41
|
+
"@cubejs-backend/testing": "^0.31.3",
|
|
40
42
|
"typescript": "~4.1.5"
|
|
41
43
|
},
|
|
42
44
|
"publishConfig": {
|
|
@@ -45,5 +47,5 @@
|
|
|
45
47
|
"eslintConfig": {
|
|
46
48
|
"extends": "../cubejs-linter"
|
|
47
49
|
},
|
|
48
|
-
"gitHead": "
|
|
50
|
+
"gitHead": "731b43141fc9160dacf2564d4433ac9d0e54ed63"
|
|
49
51
|
}
|