@cubejs-backend/prestodb-driver 1.3.28 → 1.3.29
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.
|
@@ -8,8 +8,12 @@ import { DownloadQueryResultsOptions, DownloadQueryResultsResult, DriverCapabili
|
|
|
8
8
|
import type { ConnectionOptions as TLSConnectionOptions } from 'tls';
|
|
9
9
|
export type PrestoDriverExportBucket = {
|
|
10
10
|
exportBucket?: string;
|
|
11
|
-
bucketType?: 'gcs';
|
|
11
|
+
bucketType?: 'gcs' | 's3';
|
|
12
12
|
credentials?: any;
|
|
13
|
+
accessKeyId?: string;
|
|
14
|
+
secretAccessKey?: string;
|
|
15
|
+
exportBucketRegion?: string;
|
|
16
|
+
exportBucketS3AdvancedFS?: boolean;
|
|
13
17
|
exportBucketCsvEscapeSymbol?: string;
|
|
14
18
|
};
|
|
15
19
|
export type PrestoDriverConfiguration = PrestoDriverExportBucket & {
|
|
@@ -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,EACV,aAAa,EACd,MAAM,6BAA6B,CAAC;AAOrC,OAAO,KAAK,EAAE,iBAAiB,IAAI,oBAAoB,EAAE,MAAM,KAAK,CAAC;AASrE,MAAM,MAAM,wBAAwB,GAAG;IACrC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"PrestoDriver.d.ts","sourceRoot":"","sources":["../../src/PrestoDriver.ts"],"names":[],"mappings":"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"}
|
package/dist/src/PrestoDriver.js
CHANGED
|
@@ -15,7 +15,7 @@ const stream_1 = require("stream");
|
|
|
15
15
|
const ramda_1 = require("ramda");
|
|
16
16
|
const sqlstring_1 = __importDefault(require("sqlstring"));
|
|
17
17
|
const presto = require('presto-client');
|
|
18
|
-
const SUPPORTED_BUCKET_TYPES = ['gcs'];
|
|
18
|
+
const SUPPORTED_BUCKET_TYPES = ['gcs', 's3'];
|
|
19
19
|
/**
|
|
20
20
|
* Presto driver class.
|
|
21
21
|
*/
|
|
@@ -55,8 +55,11 @@ class PrestoDriver extends base_driver_1.BaseDriver {
|
|
|
55
55
|
...(authToken ? { custom_auth: `Bearer ${authToken}` } : {}),
|
|
56
56
|
...(dbPassword ? { basic_auth: { user: dbUser, password: dbPassword } } : {}),
|
|
57
57
|
ssl: this.getSslOptions(dataSource),
|
|
58
|
-
bucketType: (0, shared_1.getEnv)('dbExportBucketType', { supported:
|
|
58
|
+
bucketType: (0, shared_1.getEnv)('dbExportBucketType', { supported: SUPPORTED_BUCKET_TYPES, dataSource }),
|
|
59
59
|
exportBucket: (0, shared_1.getEnv)('dbExportBucket', { dataSource }),
|
|
60
|
+
accessKeyId: (0, shared_1.getEnv)('dbExportBucketAwsKey', { dataSource }),
|
|
61
|
+
secretAccessKey: (0, shared_1.getEnv)('dbExportBucketAwsSecret', { dataSource }),
|
|
62
|
+
exportBucketRegion: (0, shared_1.getEnv)('dbExportBucketAwsRegion', { dataSource }),
|
|
60
63
|
credentials: (0, shared_1.getEnv)('dbExportGCSCredentials', { dataSource }),
|
|
61
64
|
...config
|
|
62
65
|
};
|
|
@@ -232,7 +235,10 @@ class PrestoDriver extends base_driver_1.BaseDriver {
|
|
|
232
235
|
const types = await this.queryColumnTypes(params.typeSql, params.typeParams);
|
|
233
236
|
const { schema, tableName } = this.splitTableFullName(params.tableFullName);
|
|
234
237
|
const tableWithCatalogAndSchema = `${this.config.catalog}.${schema}.${tableName}`;
|
|
235
|
-
const protocol =
|
|
238
|
+
const protocol = {
|
|
239
|
+
gcs: 'gs',
|
|
240
|
+
s3: this.config.exportBucketS3AdvancedFS ? 's3a' : 's3'
|
|
241
|
+
}[bucketType || 'gcs'];
|
|
236
242
|
const externalLocation = `${protocol}://${exportBucket}/${schema}/${tableName}`;
|
|
237
243
|
const withParams = `( external_location = '${externalLocation}', format = 'CSV')`;
|
|
238
244
|
const select = `SELECT ${this.generateTableColumnsForExport(types)} FROM (${params.fromSql})`;
|
|
@@ -257,11 +263,21 @@ class PrestoDriver extends base_driver_1.BaseDriver {
|
|
|
257
263
|
if (!this.config.exportBucket) {
|
|
258
264
|
throw new Error('Export bucket is not configured.');
|
|
259
265
|
}
|
|
260
|
-
const { bucketType, exportBucket
|
|
266
|
+
const { bucketType, exportBucket } = this.config;
|
|
261
267
|
const { schema, tableName } = this.splitTableFullName(tableFullName);
|
|
262
268
|
switch (bucketType) {
|
|
263
269
|
case 'gcs':
|
|
264
|
-
return this.extractFilesFromGCS({ credentials }, exportBucket, `${schema}/${tableName}`);
|
|
270
|
+
return this.extractFilesFromGCS({ credentials: this.config.credentials }, exportBucket, `${schema}/${tableName}`);
|
|
271
|
+
case 's3':
|
|
272
|
+
return this.extractUnloadedFilesFromS3({
|
|
273
|
+
credentials: this.config.accessKeyId && this.config.secretAccessKey
|
|
274
|
+
? {
|
|
275
|
+
accessKeyId: this.config.accessKeyId,
|
|
276
|
+
secretAccessKey: this.config.secretAccessKey,
|
|
277
|
+
}
|
|
278
|
+
: undefined,
|
|
279
|
+
region: this.config.exportBucketRegion,
|
|
280
|
+
}, exportBucket, `${schema}/${tableName}`);
|
|
265
281
|
default:
|
|
266
282
|
throw new Error(`Unsupported export bucket type: ${bucketType}`);
|
|
267
283
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PrestoDriver.js","sourceRoot":"","sources":["../../src/PrestoDriver.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;AAEH,6DAQqC;AACrC,mDAGgC;AAEhC,mCAAsD;AAGtD,iCAEe;AACf,0DAAkC;AAElC,MAAM,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;
|
|
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": "1.3.
|
|
5
|
+
"version": "1.3.29",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
8
8
|
"url": "https://github.com/cube-js/cube.git",
|
|
@@ -27,8 +27,8 @@
|
|
|
27
27
|
"lint:fix": "eslint --fix src/* --ext .ts"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@cubejs-backend/base-driver": "1.3.
|
|
31
|
-
"@cubejs-backend/shared": "1.3.
|
|
30
|
+
"@cubejs-backend/base-driver": "1.3.29",
|
|
31
|
+
"@cubejs-backend/shared": "1.3.29",
|
|
32
32
|
"presto-client": "^1.1.0",
|
|
33
33
|
"ramda": "^0.27.0",
|
|
34
34
|
"sqlstring": "^2.3.1"
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
"access": "public"
|
|
39
39
|
},
|
|
40
40
|
"devDependencies": {
|
|
41
|
-
"@cubejs-backend/linter": "1.3.
|
|
41
|
+
"@cubejs-backend/linter": "1.3.29",
|
|
42
42
|
"@types/jest": "^29",
|
|
43
43
|
"jest": "^29",
|
|
44
44
|
"should": "^13.2.3",
|
|
@@ -48,5 +48,5 @@
|
|
|
48
48
|
"eslintConfig": {
|
|
49
49
|
"extends": "../cubejs-linter"
|
|
50
50
|
},
|
|
51
|
-
"gitHead": "
|
|
51
|
+
"gitHead": "d1445cddfdf44821e1fd9e8898a7624d5bb77d56"
|
|
52
52
|
}
|