@cubejs-backend/jdbc-driver 0.34.47 → 0.34.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/JDBCDriver.d.ts +3 -4
- package/dist/src/JDBCDriver.d.ts.map +1 -1
- package/dist/src/JDBCDriver.js +21 -19
- package/dist/src/JDBCDriver.js.map +1 -1
- package/dist/src/QueryStream.d.ts +1 -1
- package/dist/src/QueryStream.d.ts.map +1 -1
- package/dist/src/QueryStream.js +2 -3
- package/dist/src/QueryStream.js.map +1 -1
- package/package.json +4 -4
package/dist/src/JDBCDriver.d.ts
CHANGED
|
@@ -3,9 +3,7 @@
|
|
|
3
3
|
* @license Apache-2.0
|
|
4
4
|
* @fileoverview The `JDBCDriver` and related types declaration.
|
|
5
5
|
*/
|
|
6
|
-
|
|
7
|
-
import { Readable } from 'stream';
|
|
8
|
-
import { BaseDriver } from '@cubejs-backend/base-driver';
|
|
6
|
+
import { BaseDriver, DownloadQueryResultsOptions, DownloadQueryResultsResult, StreamOptions } from '@cubejs-backend/base-driver';
|
|
9
7
|
import { Factory, Pool } from 'generic-pool';
|
|
10
8
|
import { DriverOptionsInterface } from './supported-drivers';
|
|
11
9
|
import { JDBCDriverConfiguration } from './types';
|
|
@@ -38,7 +36,8 @@ export declare class JDBCDriver extends BaseDriver {
|
|
|
38
36
|
query<R = unknown>(query: string, values: unknown[]): Promise<R[]>;
|
|
39
37
|
protected withConnection<T extends Function>(fn: T): Promise<any>;
|
|
40
38
|
protected queryPromised(query: string, cancelObj: any, options: any): Promise<any>;
|
|
41
|
-
|
|
39
|
+
stream(sql: string, values: unknown[], { highWaterMark }: StreamOptions): Promise<DownloadQueryResultsResult>;
|
|
40
|
+
downloadQueryResults(query: string, values: unknown[], options: DownloadQueryResultsOptions): Promise<DownloadQueryResultsResult>;
|
|
42
41
|
protected executeStatement(conn: any, query: any, cancelObj?: any): Promise<any>;
|
|
43
42
|
release(): Promise<void>;
|
|
44
43
|
static getSupportedDrivers(): string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JDBCDriver.d.ts","sourceRoot":"","sources":["../../src/JDBCDriver.ts"],"names":[],"mappings":"AAAA;;;;GAIG
|
|
1
|
+
{"version":3,"file":"JDBCDriver.d.ts","sourceRoot":"","sources":["../../src/JDBCDriver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AASH,OAAO,EACL,UAAU,EACV,2BAA2B,EAC3B,0BAA0B,EAC1B,aAAa,EACd,MAAM,6BAA6B,CAAC;AAGrC,OAAoB,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAG1D,OAAO,EAAE,sBAAsB,EAAoB,MAAM,qBAAqB,CAAC;AAE/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAC;AAgDlD,UAAU,YAAa,SAAQ,IAAI,CAAC,GAAG,CAAC;IACtC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;CACxB;AAED,qBAAa,UAAW,SAAQ,UAAU;IACxC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,uBAAuB,CAAC;IAEnD,SAAS,CAAC,IAAI,EAAE,YAAY,CAAC;IAE7B,SAAS,CAAC,SAAS,EAAE,GAAG,CAAC;gBAGvB,MAAM,GAAE,OAAO,CAAC,uBAAuB,CAAC,GAAG;QACzC;;WAEG;QACH,UAAU,CAAC,EAAE,MAAM,CAAC;QAEpB;;WAEG;QACH,WAAW,CAAC,EAAE,MAAM,CAAC;QAErB;;;WAGG;QACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;KAC3B;cAsFQ,kBAAkB;IAIlC,SAAS,CAAC,iBAAiB;IAYd,cAAc;IAe3B,SAAS,CAAC,wBAAwB;IAOrB,KAAK,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;cAU/D,cAAc,CAAC,CAAC,SAAS,QAAQ,EAAE,EAAE,EAAE,CAAC;cAUxC,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG;IAsB5D,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,aAAa,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,0BAA0B,CAAC;IAoD7G,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,2BAA2B,GAAG,OAAO,CAAC,0BAA0B,CAAC;cAO9H,gBAAgB,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,CAAC,EAAE,GAAG;IAiB1D,OAAO;WAKN,mBAAmB,IAAI,MAAM,EAAE;WAI/B,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,sBAAsB;CAGxE"}
|
package/dist/src/JDBCDriver.js
CHANGED
|
@@ -221,7 +221,7 @@ class JDBCDriver extends base_driver_1.BaseDriver {
|
|
|
221
221
|
}
|
|
222
222
|
}
|
|
223
223
|
}
|
|
224
|
-
async
|
|
224
|
+
async stream(sql, values, { highWaterMark }) {
|
|
225
225
|
const conn = await this.pool.acquire();
|
|
226
226
|
const query = applyParams(sql, values);
|
|
227
227
|
const cancelObj = {};
|
|
@@ -233,27 +233,23 @@ class JDBCDriver extends base_driver_1.BaseDriver {
|
|
|
233
233
|
}
|
|
234
234
|
const executeQuery = (0, util_1.promisify)(statement.execute.bind(statement));
|
|
235
235
|
const resultSet = await executeQuery(query);
|
|
236
|
-
return new Promise((resolve, reject) => {
|
|
236
|
+
return (await new Promise((resolve, reject) => {
|
|
237
237
|
resultSet.toObjectIter((err, res) => {
|
|
238
|
-
if (err)
|
|
238
|
+
if (err) {
|
|
239
239
|
reject(err);
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
const
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
}
|
|
250
|
-
};
|
|
251
|
-
rowsStream.once('end', cleanup);
|
|
252
|
-
rowsStream.once('error', cleanup);
|
|
253
|
-
rowsStream.once('close', cleanup);
|
|
254
|
-
resolve(rowsStream);
|
|
240
|
+
return;
|
|
241
|
+
}
|
|
242
|
+
const rowStream = new QueryStream_1.QueryStream(res.rows.next, highWaterMark);
|
|
243
|
+
resolve({
|
|
244
|
+
rowStream,
|
|
245
|
+
release: () => this.pool.release(conn),
|
|
246
|
+
types: res.types.map((t, i) => ({
|
|
247
|
+
name: res.labels[i],
|
|
248
|
+
type: this.toGenericType(((t === -5 ? 'bigint' : resultSet._types[t]) || 'string').toLowerCase())
|
|
249
|
+
}))
|
|
250
|
+
});
|
|
255
251
|
});
|
|
256
|
-
});
|
|
252
|
+
}));
|
|
257
253
|
}
|
|
258
254
|
catch (ex) {
|
|
259
255
|
await this.pool.release(conn);
|
|
@@ -265,6 +261,12 @@ class JDBCDriver extends base_driver_1.BaseDriver {
|
|
|
265
261
|
}
|
|
266
262
|
}
|
|
267
263
|
}
|
|
264
|
+
async downloadQueryResults(query, values, options) {
|
|
265
|
+
if (options.streamImport) {
|
|
266
|
+
return this.stream(query, values, options);
|
|
267
|
+
}
|
|
268
|
+
return super.downloadQueryResults(query, values, options);
|
|
269
|
+
}
|
|
268
270
|
async executeStatement(conn, query, cancelObj) {
|
|
269
271
|
const createStatementAsync = (0, util_1.promisify)(conn.createStatement.bind(conn));
|
|
270
272
|
const statement = await createStatementAsync();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JDBCDriver.js","sourceRoot":"","sources":["../../src/JDBCDriver.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIH,mDAIgC;AAChC,
|
|
1
|
+
{"version":3,"file":"JDBCDriver.js","sourceRoot":"","sources":["../../src/JDBCDriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryStream.d.ts","sourceRoot":"","sources":["../../src/QueryStream.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAGlC,MAAM,MAAM,GAAG,GAAG;IAChB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,CAAA;CAC3C,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG,MAAM;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,GAAG,CAAC;CACZ,CAAC;AAEF,qBAAa,WAAY,SAAQ,QAAQ;IACvC,OAAO,CAAC,IAAI,CAAgB;IAE5B;;OAEG;gBACgB,MAAM,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"QueryStream.d.ts","sourceRoot":"","sources":["../../src/QueryStream.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAGlC,MAAM,MAAM,GAAG,GAAG;IAChB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,CAAA;CAC3C,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG,MAAM;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,GAAG,CAAC;CACZ,CAAC;AAEF,qBAAa,WAAY,SAAQ,QAAQ;IACvC,OAAO,CAAC,IAAI,CAAgB;IAE5B;;OAEG;gBACgB,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;IAQxD;;OAEG;IACI,KAAK,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI;IAiBzC;;OAEG;IACI,QAAQ,CACb,KAAK,EAAE,KAAK,GAAG,IAAI,EACnB,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,KAAK,IAAI,GACnD,IAAI;CAIR"}
|
package/dist/src/QueryStream.js
CHANGED
|
@@ -3,15 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.QueryStream = void 0;
|
|
4
4
|
/* eslint-disable import/no-extraneous-dependencies */
|
|
5
5
|
const stream_1 = require("stream");
|
|
6
|
-
const shared_1 = require("@cubejs-backend/shared");
|
|
7
6
|
class QueryStream extends stream_1.Readable {
|
|
8
7
|
/**
|
|
9
8
|
* @constructor
|
|
10
9
|
*/
|
|
11
|
-
constructor(nextFn) {
|
|
10
|
+
constructor(nextFn, highWaterMark) {
|
|
12
11
|
super({
|
|
13
12
|
objectMode: true,
|
|
14
|
-
highWaterMark
|
|
13
|
+
highWaterMark,
|
|
15
14
|
});
|
|
16
15
|
this.next = nextFn;
|
|
17
16
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryStream.js","sourceRoot":"","sources":["../../src/QueryStream.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,mCAAkC;
|
|
1
|
+
{"version":3,"file":"QueryStream.js","sourceRoot":"","sources":["../../src/QueryStream.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,mCAAkC;AAYlC,MAAa,WAAY,SAAQ,iBAAQ;IAGvC;;OAEG;IACH,YAAmB,MAAc,EAAE,aAAqB;QACtD,KAAK,CAAC;YACJ,UAAU,EAAE,IAAI;YAChB,aAAa;SACd,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC;IACrB,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,aAAqB;QAChC,UAAU,CAAC,GAAG,EAAE;YACd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,EAAE,CAAC,EAAE,EAAE;gBACtC,IAAI,IAAI,CAAC,IAAI,EAAE;oBACb,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;oBACxB,IAAI,GAAG,CAAC,KAAK,EAAE;wBACb,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;qBACtB;oBACD,IAAI,GAAG,CAAC,IAAI,EAAE;wBACZ,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;wBAChB,MAAM;qBACP;iBACF;aACF;QACH,CAAC,EAAE,CAAC,CAAC,CAAC;IACR,CAAC;IAED;;OAEG;IACI,QAAQ,CACb,KAAmB,EACnB,QAAoD;QAEpD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,QAAQ,CAAC,KAAK,CAAC,CAAC;IAClB,CAAC;CACF;AA5CD,kCA4CC"}
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@cubejs-backend/jdbc-driver",
|
|
3
3
|
"description": "Cube.js JDBC database driver",
|
|
4
4
|
"author": "Cube Dev, Inc.",
|
|
5
|
-
"version": "0.34.
|
|
5
|
+
"version": "0.34.54",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
8
8
|
"url": "https://github.com/cube-js/cube.git",
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
"index.js"
|
|
26
26
|
],
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@cubejs-backend/base-driver": "^0.34.
|
|
28
|
+
"@cubejs-backend/base-driver": "^0.34.54",
|
|
29
29
|
"generic-pool": "^3.1.7",
|
|
30
30
|
"node-java-maven": "^0.1.2",
|
|
31
31
|
"sqlstring": "^2.3.0"
|
|
@@ -43,11 +43,11 @@
|
|
|
43
43
|
},
|
|
44
44
|
"devDependencies": {
|
|
45
45
|
"@cubejs-backend/linter": "^0.34.25",
|
|
46
|
-
"@cubejs-backend/shared": "^0.34.
|
|
46
|
+
"@cubejs-backend/shared": "^0.34.54",
|
|
47
47
|
"@types/generic-pool": "^3.1.9",
|
|
48
48
|
"@types/node": "^14",
|
|
49
49
|
"@types/sqlstring": "^2.3.0",
|
|
50
50
|
"typescript": "~5.2.2"
|
|
51
51
|
},
|
|
52
|
-
"gitHead": "
|
|
52
|
+
"gitHead": "3cf12c552abab316c33cc26a73f917b34621e457"
|
|
53
53
|
}
|