@cubejs-backend/prestodb-driver 0.31.58 → 0.31.60
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.
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* @fileoverview The `PrestoDriver` and related types declaration.
|
|
5
5
|
*/
|
|
6
6
|
import { DownloadQueryResultsOptions, DownloadQueryResultsResult, DriverCapabilities, DriverInterface, StreamOptions, StreamTableData, TableStructure, BaseDriver } from '@cubejs-backend/base-driver';
|
|
7
|
-
export
|
|
7
|
+
export type PrestoDriverConfiguration = {
|
|
8
8
|
host?: string;
|
|
9
9
|
port?: string;
|
|
10
10
|
catalog?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PrestoDriver.d.ts","sourceRoot":"","sources":["../../src/PrestoDriver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,2BAA2B,EAAE,0BAA0B,EACvD,kBAAkB,EAAE,eAAe,EACnC,aAAa,EACb,eAAe,EACf,cAAc,EACd,UAAU,EACX,MAAM,6BAA6B,CAAC;AAarC,
|
|
1
|
+
{"version":3,"file":"PrestoDriver.d.ts","sourceRoot":"","sources":["../../src/PrestoDriver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,2BAA2B,EAAE,0BAA0B,EACvD,kBAAkB,EAAE,eAAe,EACnC,aAAa,EACb,eAAe,EACf,cAAc,EACd,UAAU,EACX,MAAM,6BAA6B,CAAC;AAarC,MAAM,MAAM,yBAAyB,GAAG;IACtC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,UAAU,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;IAChD,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,qBAAa,YAAa,SAAQ,UAAW,YAAW,eAAe;IACrE;;OAEG;WACW,qBAAqB;IAInC,OAAO,CAAC,MAAM,CAA4B;IAE1C,OAAO,CAAC,OAAO,CAAqB;IAEpC,OAAO,CAAC,MAAM,CAAM;IAEpB;;OAEG;gBACgB,MAAM,GAAE,yBAA8B;IA8BlD,cAAc;IAWd,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAIvD,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE;IAMvD,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,eAAe,CAAC;IA0DlF,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,2BAA2B,GAAG,OAAO,CAAC,0BAA0B,CAAC;IAOjI,0BAA0B,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,cAAc;;;IAM/D,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;IAM3F,YAAY,IAAI,kBAAkB;CAK1C"}
|
package/dist/src/PrestoDriver.js
CHANGED
|
@@ -19,25 +19,31 @@ const presto = require('presto-client');
|
|
|
19
19
|
* Presto driver class.
|
|
20
20
|
*/
|
|
21
21
|
class PrestoDriver extends base_driver_1.BaseDriver {
|
|
22
|
+
/**
|
|
23
|
+
* Returns default concurrency value.
|
|
24
|
+
*/
|
|
25
|
+
static getDefaultConcurrency() {
|
|
26
|
+
return 2;
|
|
27
|
+
}
|
|
22
28
|
/**
|
|
23
29
|
* Class constructor.
|
|
24
30
|
*/
|
|
25
31
|
constructor(config = {}) {
|
|
26
32
|
super();
|
|
27
33
|
const dataSource = config.dataSource ||
|
|
28
|
-
shared_1.assertDataSource('default');
|
|
34
|
+
(0, shared_1.assertDataSource)('default');
|
|
29
35
|
this.config = {
|
|
30
|
-
host: shared_1.getEnv('dbHost', { dataSource }),
|
|
31
|
-
port: shared_1.getEnv('dbPort', { dataSource }),
|
|
32
|
-
catalog: shared_1.getEnv('prestoCatalog', { dataSource }) ||
|
|
33
|
-
shared_1.getEnv('dbCatalog', { dataSource }),
|
|
34
|
-
schema: shared_1.getEnv('dbName', { dataSource }) ||
|
|
35
|
-
shared_1.getEnv('dbSchema', { dataSource }),
|
|
36
|
-
user: shared_1.getEnv('dbUser', { dataSource }),
|
|
37
|
-
basic_auth: shared_1.getEnv('dbPass', { dataSource })
|
|
36
|
+
host: (0, shared_1.getEnv)('dbHost', { dataSource }),
|
|
37
|
+
port: (0, shared_1.getEnv)('dbPort', { dataSource }),
|
|
38
|
+
catalog: (0, shared_1.getEnv)('prestoCatalog', { dataSource }) ||
|
|
39
|
+
(0, shared_1.getEnv)('dbCatalog', { dataSource }),
|
|
40
|
+
schema: (0, shared_1.getEnv)('dbName', { dataSource }) ||
|
|
41
|
+
(0, shared_1.getEnv)('dbSchema', { dataSource }),
|
|
42
|
+
user: (0, shared_1.getEnv)('dbUser', { dataSource }),
|
|
43
|
+
basic_auth: (0, shared_1.getEnv)('dbPass', { dataSource })
|
|
38
44
|
? {
|
|
39
|
-
user: shared_1.getEnv('dbUser', { dataSource }),
|
|
40
|
-
password: shared_1.getEnv('dbPass', { dataSource }),
|
|
45
|
+
user: (0, shared_1.getEnv)('dbUser', { dataSource }),
|
|
46
|
+
password: (0, shared_1.getEnv)('dbPass', { dataSource }),
|
|
41
47
|
}
|
|
42
48
|
: undefined,
|
|
43
49
|
ssl: this.getSslOptions(dataSource),
|
|
@@ -46,12 +52,6 @@ class PrestoDriver extends base_driver_1.BaseDriver {
|
|
|
46
52
|
this.catalog = this.config.catalog;
|
|
47
53
|
this.client = new presto.Client(this.config);
|
|
48
54
|
}
|
|
49
|
-
/**
|
|
50
|
-
* Returns default concurrency value.
|
|
51
|
-
*/
|
|
52
|
-
static getDefaultConcurrency() {
|
|
53
|
-
return 2;
|
|
54
|
-
}
|
|
55
55
|
testConnection() {
|
|
56
56
|
const query = sqlstring_1.default.format('show catalogs like ?', [`%${this.catalog}%`]);
|
|
57
57
|
return this.queryPromised(query, false)
|
|
@@ -112,7 +112,7 @@ class PrestoDriver extends base_driver_1.BaseDriver {
|
|
|
112
112
|
schema: this.config.schema || 'default',
|
|
113
113
|
data: (error, data, columns) => {
|
|
114
114
|
const normalData = this.normalizeResultOverColumns(data, columns);
|
|
115
|
-
fullData = ramda_1.concat(normalData, fullData);
|
|
115
|
+
fullData = (0, ramda_1.concat)(normalData, fullData);
|
|
116
116
|
},
|
|
117
117
|
success: () => {
|
|
118
118
|
resolve(fullData);
|
|
@@ -131,9 +131,9 @@ class PrestoDriver extends base_driver_1.BaseDriver {
|
|
|
131
131
|
return super.downloadQueryResults(query, values, options);
|
|
132
132
|
}
|
|
133
133
|
normalizeResultOverColumns(data, columns) {
|
|
134
|
-
const columnNames = ramda_1.map(ramda_1.prop('name'), columns || []);
|
|
135
|
-
const arrayToObject = ramda_1.zipObj(columnNames);
|
|
136
|
-
return ramda_1.map(arrayToObject, data || []);
|
|
134
|
+
const columnNames = (0, ramda_1.map)((0, ramda_1.prop)('name'), columns || []);
|
|
135
|
+
const arrayToObject = (0, ramda_1.zipObj)(columnNames);
|
|
136
|
+
return (0, ramda_1.map)(arrayToObject, data || []);
|
|
137
137
|
}
|
|
138
138
|
stream(query, values, _options) {
|
|
139
139
|
const queryWithParams = this.prepareQueryWithParams(query, values);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PrestoDriver.js","sourceRoot":"","sources":["../../src/PrestoDriver.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;AAEH,6DAOqC;AACrC,mDAGgC;AAChC,mCAAsD;AACtD,iCAEe;AACf,0DAAkC;AAElC,MAAM,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AAcxC;;GAEG;AACH,MAAa,YAAa,SAAQ,wBAAU;
|
|
1
|
+
{"version":3,"file":"PrestoDriver.js","sourceRoot":"","sources":["../../src/PrestoDriver.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@cubejs-backend/prestodb-driver",
|
|
3
3
|
"description": "Cube.js Presto database driver",
|
|
4
4
|
"author": "Cube Dev, Inc.",
|
|
5
|
-
"version": "0.31.
|
|
5
|
+
"version": "0.31.60",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
8
8
|
"url": "https://github.com/cube-js/cube.js.git",
|
|
@@ -27,8 +27,8 @@
|
|
|
27
27
|
"lint:fix": "eslint --fix src/* --ext .ts"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@cubejs-backend/base-driver": "^0.31.
|
|
31
|
-
"@cubejs-backend/shared": "^0.31.
|
|
30
|
+
"@cubejs-backend/base-driver": "^0.31.60",
|
|
31
|
+
"@cubejs-backend/shared": "^0.31.60",
|
|
32
32
|
"presto-client": "^0.12.2",
|
|
33
33
|
"ramda": "^0.27.0",
|
|
34
34
|
"sqlstring": "^2.3.1"
|
|
@@ -42,10 +42,10 @@
|
|
|
42
42
|
"jest": "^26.6.3",
|
|
43
43
|
"should": "^13.2.3",
|
|
44
44
|
"testcontainers": "^8.12",
|
|
45
|
-
"typescript": "~4.
|
|
45
|
+
"typescript": "~4.9.5"
|
|
46
46
|
},
|
|
47
47
|
"eslintConfig": {
|
|
48
48
|
"extends": "../cubejs-linter"
|
|
49
49
|
},
|
|
50
|
-
"gitHead": "
|
|
50
|
+
"gitHead": "3da3fc07f66506feba4e4b552246aefd8719bb29"
|
|
51
51
|
}
|