@cubejs-backend/athena-driver 0.31.36 → 0.31.38

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.
Files changed (5) hide show
  1. package/dist/src/AthenaDriver.d.ts +11 -3
  2. package/dist/src/AthenaDriver.d.ts.map +1 -1
  3. package/dist/src/AthenaDriver.js +25 -8
  4. package/dist/src/AthenaDriver.js.map +1 -1
  5. package/package.json +5 -5
package/dist/src/AthenaDriver.d.ts CHANGED
@@ -3,13 +3,15 @@
3
3
  * @license Apache-2.0
4
4
  * @fileoverview The `AthenaDriver` and related types declaration.
5
5
  */
6
- import { BaseDriver, DatabaseStructure, DownloadTableCSVData, DriverInterface, QueryOptions, StreamOptions, StreamTableData, TableName } from '@cubejs-backend/base-driver';
6
+ import { BaseDriver, DatabaseStructure, DownloadTableCSVData, DriverInterface, QueryOptions, StreamOptions, StreamTableData } from '@cubejs-backend/base-driver';
7
7
  import { AthenaClientConfig } from '@aws-sdk/client-athena/dist-types/AthenaClient';
8
8
  interface AthenaDriverOptions extends AthenaClientConfig {
9
9
  readOnly?: boolean;
10
10
  accessKeyId?: string;
11
11
  secretAccessKey?: string;
12
12
  workGroup?: string;
13
+ catalog?: string;
14
+ schema?: string;
13
15
  S3OutputLocation?: string;
14
16
  exportBucket?: string;
15
17
  pollTimeout?: number;
@@ -22,6 +24,10 @@ interface AthenaDriverOptions extends AthenaClientConfig {
22
24
  export interface AthenaQueryId {
23
25
  QueryExecutionId: string;
24
26
  }
27
+ interface AthenaTable {
28
+ schema: string;
29
+ name: string;
30
+ }
25
31
  export declare class AthenaDriver extends BaseDriver implements DriverInterface {
26
32
  /**
27
33
  * Returns default concurrency value.
@@ -29,6 +35,7 @@ export declare class AthenaDriver extends BaseDriver implements DriverInterface
29
35
  static getDefaultConcurrency(): number;
30
36
  private config;
31
37
  private athena;
38
+ private schema;
32
39
  /**
33
40
  * Class constructor.
34
41
  */
@@ -49,14 +56,15 @@ export declare class AthenaDriver extends BaseDriver implements DriverInterface
49
56
  stream(query: string, values: unknown[], options: StreamOptions): Promise<StreamTableData>;
50
57
  loadPreAggregationIntoTable(preAggregationTableName: string, loadSql: string, params: any): Promise<any>;
51
58
  unload(tableName: string): Promise<DownloadTableCSVData>;
59
+ informationSchemaQuery(): string;
52
60
  tablesSchema(): Promise<DatabaseStructure>;
53
61
  protected startQuery(query: string, values: unknown[]): Promise<AthenaQueryId>;
54
62
  protected checkStatus(qid: AthenaQueryId): Promise<boolean>;
55
63
  protected waitForSuccess(qid: AthenaQueryId): Promise<void>;
56
64
  protected lazyRowIterator<R extends unknown>(qid: AthenaQueryId, query: string): AsyncGenerator<R>;
57
65
  protected viewsSchema(tablesSchema: DatabaseStructure): Promise<DatabaseStructure>;
58
- protected getAllTables(): Promise<TableName[]>;
59
- protected getColumns(table: TableName): Promise<DatabaseStructure>;
66
+ protected getAllTables(): Promise<AthenaTable[]>;
67
+ protected getColumns(table: AthenaTable): Promise<DatabaseStructure>;
60
68
  protected mergeSchemas(arrSchemas: DatabaseStructure[]): DatabaseStructure;
61
69
  static normalizeS3Path(path: string): string;
62
70
  static splitS3Path(path: string): {
package/dist/src/AthenaDriver.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"AthenaDriver.d.ts","sourceRoot":"","sources":["../../src/AthenaDriver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAaH,OAAO,EACL,UAAU,EAAE,iBAAiB,EAC7B,oBAAoB,EACpB,eAAe,EACf,YAAY,EAAE,aAAa,EAC3B,eAAe,EAAE,SAAS,EAC3B,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AAGpF,UAAU,mBAAoB,SAAQ,kBAAkB;IACtD,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,eAAe,CAAC,EAAE,MAAM,CAAA;IAExB;;OAEG;IACH,2BAA2B,CAAC,EAAE,MAAM,CAAA;CACrC;AAID,MAAM,WAAW,aAAa;IAC5B,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAMD,qBAAa,YAAa,SAAQ,UAAW,YAAW,eAAe;IACrE;;OAEG;WACW,qBAAqB,IAAI,MAAM;IAI7C,OAAO,CAAC,MAAM,CAAiC;IAE/C,OAAO,CAAC,MAAM,CAAS;IAEvB;;OAEG;gBAED,MAAM,GAAE,mBAAmB,GAAG;QAC5B;;WAEG;QACH,UAAU,CAAC,EAAE,MAAM,CAAC;QAEpB;;WAEG;QACH,WAAW,CAAC,EAAE,MAAM,CAAC;KACjB;IAoDD,QAAQ,IAAI,OAAO;IAIb,iBAAiB;IAIjB,cAAc;IAOd,KAAK,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAU1F,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;IAS1F,2BAA2B,CACtC,uBAAuB,EAAE,MAAM,EAC/B,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,GAAG,GACV,OAAO,CAAC,GAAG,CAAC;IASF,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAoDxD,YAAY,IAAI,OAAO,CAAC,iBAAiB,CAAC;cAOvC,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC;cAkBpE,WAAW,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC;cAejD,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;cAehD,eAAe,CAAC,CAAC,SAAS,OAAO,EAAE,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,GAAG,cAAc,CAAC,CAAC,CAAC;cAgCzF,WAAW,CAAC,YAAY,EAAE,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC;cAcxE,YAAY,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;cAapC,UAAU,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAaxE,SAAS,CAAC,YAAY,CAAC,UAAU,EAAE,iBAAiB,EAAE,GAAG,iBAAiB;WAe5D,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;WAUrC,WAAW,CAAC,IAAI,EAAE,MAAM;;;;CAOvC"}
1
+ {"version":3,"file":"AthenaDriver.d.ts","sourceRoot":"","sources":["../../src/AthenaDriver.ts"],"names":[],"mappings":"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"}
package/dist/src/AthenaDriver.js CHANGED
@@ -48,8 +48,12 @@ class AthenaDriver extends base_driver_1.BaseDriver {
48
48
  shared_1.getEnv('athenaAwsKey', { dataSource });
49
49
  const secretAccessKey = config.secretAccessKey ||
50
50
  shared_1.getEnv('athenaAwsSecret', { dataSource });
51
+ const { schema, ...restConfig } = config;
52
+ this.schema = schema ||
53
+ shared_1.getEnv('dbName', { dataSource }) ||
54
+ shared_1.getEnv('dbSchema', { dataSource });
51
55
  this.config = {
52
- ...config,
56
+ ...restConfig,
53
57
  credentials: accessKeyId && secretAccessKey
54
58
  ? { accessKeyId, secretAccessKey }
55
59
  : undefined,
@@ -60,6 +64,8 @@ class AthenaDriver extends base_driver_1.BaseDriver {
60
64
  workGroup: config.workGroup ||
61
65
  shared_1.getEnv('athenaAwsWorkgroup', { dataSource }) ||
62
66
  'primary',
67
+ catalog: config.catalog ||
68
+ shared_1.getEnv('athenaAwsCatalog', { dataSource }),
63
69
  exportBucket: config.exportBucket ||
64
70
  shared_1.getEnv('dbExportBucket', { dataSource }),
65
71
  pollTimeout: (config.pollTimeout ||
@@ -161,6 +167,12 @@ class AthenaDriver extends base_driver_1.BaseDriver {
161
167
  csvNoHeader: true
162
168
  };
163
169
  }
170
+ informationSchemaQuery() {
171
+ if (this.schema) {
172
+ return `${super.informationSchemaQuery()} AND columns.table_schema = '${this.schema}'`;
173
+ }
174
+ return super.informationSchemaQuery();
175
+ }
164
176
  async tablesSchema() {
165
177
  const tablesSchema = await super.tablesSchema();
166
178
  const viewsSchema = await this.viewsSchema(tablesSchema);
@@ -175,7 +187,8 @@ class AthenaDriver extends base_driver_1.BaseDriver {
175
187
  WorkGroup: this.config.workGroup,
176
188
  ResultConfiguration: {
177
189
  OutputLocation: this.config.S3OutputLocation
178
- }
190
+ },
191
+ ...(this.config.catalog != null ? { QueryExecutionContext: { Catalog: this.config.catalog } } : {})
179
192
  };
180
193
  const { QueryExecutionId } = await this.athena.startQueryExecution(request);
181
194
  return { QueryExecutionId: shared_1.checkNonNullable('StartQueryExecution', QueryExecutionId) };
@@ -240,15 +253,19 @@ class AthenaDriver extends base_driver_1.BaseDriver {
240
253
  return this.mergeSchemas(arrViewsSchema);
241
254
  }
242
255
  async getAllTables() {
243
- const rows = await this.query(`
244
- SELECT table_schema AS schema, table_name AS name
245
- FROM information_schema.tables
246
- WHERE tables.table_schema NOT IN ('information_schema', 'mysql', 'performance_schema', 'sys')
247
- `, []);
256
+ let allTablesQuery = `
257
+ SELECT table_schema AS schema, table_name AS name
258
+ FROM information_schema.tables
259
+ WHERE tables.table_schema NOT IN ('information_schema', 'mysql', 'performance_schema', 'sys')
260
+ `;
261
+ if (this.schema) {
262
+ allTablesQuery = `${allTablesQuery} AND tables.table_schema = '${this.schema}'`;
263
+ }
264
+ const rows = await this.query(allTablesQuery, []);
248
265
  return rows;
249
266
  }
250
267
  async getColumns(table) {
251
- const data = await this.query(`SHOW COLUMNS IN \`${table.join()}\``, []);
268
+ const data = await this.query(`SHOW COLUMNS IN \`${table.schema}\`.\`${table.name}\``, []);
252
269
  return {
253
270
  [table.schema]: {
254
271
  [table.name]: data.map(({ column }) => {
package/dist/src/AthenaDriver.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"AthenaDriver.js","sourceRoot":"","sources":["../../src/AthenaDriver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"AthenaDriver.js","sourceRoot":"","sources":["../../src/AthenaDriver.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@cubejs-backend/athena-driver",
3
3
  "description": "Cube.js Athena database driver",
4
4
  "author": "Cube Dev, Inc.",
5
- "version": "0.31.36",
5
+ "version": "0.31.38",
6
6
  "repository": {
7
7
  "type": "git",
8
8
  "url": "https://github.com/cube-js/cube.js.git",
@@ -31,13 +31,13 @@
31
31
  "@aws-sdk/client-athena": "^3.22.0",
32
32
  "@aws-sdk/client-s3": "^3.49.0",
33
33
  "@aws-sdk/s3-request-presigner": "^3.49.0",
34
- "@cubejs-backend/base-driver": "^0.31.33",
35
- "@cubejs-backend/shared": "^0.31.33",
34
+ "@cubejs-backend/base-driver": "^0.31.38",
35
+ "@cubejs-backend/shared": "^0.31.38",
36
36
  "sqlstring": "^2.3.1"
37
37
  },
38
38
  "devDependencies": {
39
39
  "@cubejs-backend/linter": "^0.31.0",
40
- "@cubejs-backend/testing-shared": "^0.31.36",
40
+ "@cubejs-backend/testing-shared": "^0.31.38",
41
41
  "@types/ramda": "^0.27.40",
42
42
  "typescript": "~4.1.5"
43
43
  },
@@ -48,5 +48,5 @@
48
48
  "extends": "../cubejs-linter"
49
49
  },
50
50
  "license": "Apache-2.0",
51
- "gitHead": "1ff32355205bc5e484faf29c531cd313cf04bc5f"
51
+ "gitHead": "30548db96aeca9e4161b936e248964c2ec7b768a"
52
52
  }