@cubejs-backend/jdbc-driver 0.30.63 → 0.30.69
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 +16 -0
- package/dist/src/JDBCDriver.d.ts +21 -54
- package/dist/src/JDBCDriver.d.ts.map +1 -1
- package/dist/src/JDBCDriver.js +5 -49
- package/dist/src/JDBCDriver.js.map +1 -1
- package/dist/src/supported-drivers.d.ts +1 -2
- package/dist/src/supported-drivers.d.ts.map +1 -1
- package/dist/src/types.d.ts +4 -0
- package/dist/src/types.d.ts.map +1 -1
- package/package.json +4 -3
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,22 @@
|
|
|
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.30.69](https://github.com/cube-js/cube.js/compare/v0.30.68...v0.30.69) (2022-09-13)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* migrate base driver to ts ([#5233](https://github.com/cube-js/cube.js/issues/5233)) ([c24f545](https://github.com/cube-js/cube.js/commit/c24f5450d68896e06ef6830d9348c0370c22b34c))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
### Features
|
|
15
|
+
|
|
16
|
+
* **base-driver:** Split BaseDriver to @cubejs-backend/base-driver ([#5283](https://github.com/cube-js/cube.js/issues/5283)) ([ca7f9d2](https://github.com/cube-js/cube.js/commit/ca7f9d280c3518e012683c23b82175ec1f96d2a8))
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
|
|
6
22
|
## [0.30.63](https://github.com/cube-js/cube.js/compare/v0.30.62...v0.30.63) (2022-09-05)
|
|
7
23
|
|
|
8
24
|
**Note:** Version bump only for package @cubejs-backend/jdbc-driver
|
package/dist/src/JDBCDriver.d.ts
CHANGED
|
@@ -1,59 +1,26 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
*/
|
|
12
|
-
public static dbTypeDescription(dbType: string): Object;
|
|
13
|
-
/**
|
|
14
|
-
* @param {Partial<JDBCDriverConfiguration>} [config]
|
|
15
|
-
*/
|
|
16
|
-
constructor(config?: Partial<JDBCDriverConfiguration> | undefined);
|
|
17
|
-
/** @protected */
|
|
18
|
-
protected config: {
|
|
19
|
-
database?: string | undefined;
|
|
20
|
-
dbType: string | undefined;
|
|
21
|
-
url: any;
|
|
22
|
-
drivername: any;
|
|
23
|
-
customClassPath?: string | undefined;
|
|
24
|
-
properties: any;
|
|
25
|
-
};
|
|
26
|
-
/** @protected */
|
|
27
|
-
protected pool: genericPool.Pool<any>;
|
|
28
|
-
/** @protected */
|
|
1
|
+
import { BaseDriver } from '@cubejs-backend/base-driver';
|
|
2
|
+
import { Factory, Pool } from 'generic-pool';
|
|
3
|
+
import { DriverOptionsInterface } from './supported-drivers';
|
|
4
|
+
import { JDBCDriverConfiguration } from './types';
|
|
5
|
+
interface ExtendedPool extends Pool<any> {
|
|
6
|
+
_factory: Factory<any>;
|
|
7
|
+
}
|
|
8
|
+
export declare class JDBCDriver extends BaseDriver {
|
|
9
|
+
protected readonly config: JDBCDriverConfiguration;
|
|
10
|
+
protected pool: ExtendedPool;
|
|
29
11
|
protected jdbcProps: any;
|
|
30
|
-
|
|
31
|
-
* @protected
|
|
32
|
-
* @return {Promise<string|undefined>}
|
|
33
|
-
*/
|
|
12
|
+
constructor(config?: Partial<JDBCDriverConfiguration>);
|
|
34
13
|
protected getCustomClassPath(): Promise<string | undefined>;
|
|
35
|
-
/**
|
|
36
|
-
* @protected
|
|
37
|
-
*/
|
|
38
14
|
protected getJdbcProperties(): any;
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
protected
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
* @protected
|
|
49
|
-
*/
|
|
50
|
-
protected queryPromised(query: any, cancelObj: any, options: any): Promise<any>;
|
|
51
|
-
/**
|
|
52
|
-
* @protected
|
|
53
|
-
*/
|
|
54
|
-
protected executeStatement(conn: any, query: any, cancelObj: any): Promise<any>;
|
|
15
|
+
testConnection(): Promise<void>;
|
|
16
|
+
protected prepareConnectionQueries(): string[];
|
|
17
|
+
query<R = unknown>(query: string, values: unknown[]): Promise<R[]>;
|
|
18
|
+
protected withConnection<T extends Function>(fn: T): Promise<any>;
|
|
19
|
+
protected queryPromised(query: string, cancelObj: any, options: any): Promise<any>;
|
|
20
|
+
protected executeStatement(conn: any, query: any, cancelObj?: any): Promise<any>;
|
|
21
|
+
release(): Promise<void>;
|
|
22
|
+
static getSupportedDrivers(): string[];
|
|
23
|
+
static dbTypeDescription(dbType: string): DriverOptionsInterface;
|
|
55
24
|
}
|
|
56
|
-
|
|
57
|
-
import genericPool from "generic-pool";
|
|
58
|
-
import { JDBCDriverConfiguration } from "./types";
|
|
25
|
+
export {};
|
|
59
26
|
//# sourceMappingURL=JDBCDriver.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JDBCDriver.d.ts","sourceRoot":"","sources":["../../src/JDBCDriver.
|
|
1
|
+
{"version":3,"file":"JDBCDriver.d.ts","sourceRoot":"","sources":["../../src/JDBCDriver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAIzD,OAAoB,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAE1D,OAAO,EAAE,sBAAsB,EAAoB,MAAM,qBAAqB,CAAC;AAE/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAC;AAsClD,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;gBAEN,MAAM,GAAE,OAAO,CAAC,uBAAuB,CAAM;cA2DhD,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;cAS/D,cAAc,CAAC,CAAC,SAAS,QAAQ,EAAE,EAAE,EAAE,CAAC;cAUxC,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG;cAsBzD,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
|
@@ -24,7 +24,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
24
24
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
25
25
|
exports.JDBCDriver = void 0;
|
|
26
26
|
/* eslint-disable no-restricted-syntax,import/no-extraneous-dependencies */
|
|
27
|
-
const
|
|
27
|
+
const base_driver_1 = require("@cubejs-backend/base-driver");
|
|
28
28
|
const SqlString = __importStar(require("sqlstring"));
|
|
29
29
|
const util_1 = require("util");
|
|
30
30
|
const generic_pool_1 = __importDefault(require("generic-pool"));
|
|
@@ -61,15 +61,11 @@ Connection.prototype.getMetaDataAsync = util_1.promisify(Connection.prototype.ge
|
|
|
61
61
|
// promisify DatabaseMetaData methods
|
|
62
62
|
DatabaseMetaData.prototype.getSchemasAsync = util_1.promisify(DatabaseMetaData.prototype.getSchemas);
|
|
63
63
|
DatabaseMetaData.prototype.getTablesAsync = util_1.promisify(DatabaseMetaData.prototype.getTables);
|
|
64
|
-
class JDBCDriver extends
|
|
65
|
-
/**
|
|
66
|
-
* @param {Partial<JDBCDriverConfiguration>} [config]
|
|
67
|
-
*/
|
|
64
|
+
class JDBCDriver extends base_driver_1.BaseDriver {
|
|
68
65
|
constructor(config = {}) {
|
|
69
66
|
super();
|
|
70
67
|
const { poolOptions, ...dbOptions } = config || {};
|
|
71
|
-
const dbTypeDescription = JDBCDriver.dbTypeDescription(config.dbType || process.env.CUBEJS_DB_TYPE);
|
|
72
|
-
/** @protected */
|
|
68
|
+
const dbTypeDescription = JDBCDriver.dbTypeDescription((config.dbType || process.env.CUBEJS_DB_TYPE));
|
|
73
69
|
this.config = {
|
|
74
70
|
dbType: process.env.CUBEJS_DB_TYPE,
|
|
75
71
|
url: process.env.CUBEJS_JDBC_URL || dbTypeDescription && dbTypeDescription.jdbcUrl(),
|
|
@@ -83,7 +79,6 @@ class JDBCDriver extends query_orchestrator_1.BaseDriver {
|
|
|
83
79
|
if (!this.config.url) {
|
|
84
80
|
throw new Error('url is required property');
|
|
85
81
|
}
|
|
86
|
-
/** @protected */
|
|
87
82
|
this.pool = generic_pool_1.default.createPool({
|
|
88
83
|
create: async () => {
|
|
89
84
|
await initMvn(await this.getCustomClassPath());
|
|
@@ -94,6 +89,7 @@ class JDBCDriver extends query_orchestrator_1.BaseDriver {
|
|
|
94
89
|
const getConnection = util_1.promisify(DriverManager.getConnection.bind(DriverManager));
|
|
95
90
|
return new Connection(await getConnection(this.config.url, this.jdbcProps));
|
|
96
91
|
},
|
|
92
|
+
// @ts-expect-error Promise<Function> vs Promise<void>
|
|
97
93
|
destroy: async (connection) => util_1.promisify(connection.close.bind(connection)),
|
|
98
94
|
validate: (connection) => {
|
|
99
95
|
const isValid = util_1.promisify(connection.isValid.bind(connection));
|
|
@@ -113,19 +109,12 @@ class JDBCDriver extends query_orchestrator_1.BaseDriver {
|
|
|
113
109
|
idleTimeoutMillis: 30000,
|
|
114
110
|
testOnBorrow: true,
|
|
115
111
|
acquireTimeoutMillis: 20000,
|
|
116
|
-
...poolOptions
|
|
112
|
+
...(poolOptions || {})
|
|
117
113
|
});
|
|
118
114
|
}
|
|
119
|
-
/**
|
|
120
|
-
* @protected
|
|
121
|
-
* @return {Promise<string|undefined>}
|
|
122
|
-
*/
|
|
123
115
|
async getCustomClassPath() {
|
|
124
116
|
return this.config.customClassPath;
|
|
125
117
|
}
|
|
126
|
-
/**
|
|
127
|
-
* @protected
|
|
128
|
-
*/
|
|
129
118
|
getJdbcProperties() {
|
|
130
119
|
const java = jinst.getInstance();
|
|
131
120
|
const Properties = java.import('java.util.Properties');
|
|
@@ -135,10 +124,6 @@ class JDBCDriver extends query_orchestrator_1.BaseDriver {
|
|
|
135
124
|
}
|
|
136
125
|
return properties;
|
|
137
126
|
}
|
|
138
|
-
/**
|
|
139
|
-
* @public
|
|
140
|
-
* @return {Promise<*>}
|
|
141
|
-
*/
|
|
142
127
|
async testConnection() {
|
|
143
128
|
let err;
|
|
144
129
|
let connection;
|
|
@@ -155,19 +140,12 @@ class JDBCDriver extends query_orchestrator_1.BaseDriver {
|
|
|
155
140
|
await this.pool._factory.destroy(connection);
|
|
156
141
|
}
|
|
157
142
|
}
|
|
158
|
-
/**
|
|
159
|
-
* @protected
|
|
160
|
-
*/
|
|
161
143
|
prepareConnectionQueries() {
|
|
162
144
|
const dbTypeDescription = JDBCDriver.dbTypeDescription(this.config.dbType);
|
|
163
145
|
return this.config.prepareConnectionQueries ||
|
|
164
146
|
dbTypeDescription && dbTypeDescription.prepareConnectionQueries ||
|
|
165
147
|
[];
|
|
166
148
|
}
|
|
167
|
-
/**
|
|
168
|
-
* @public
|
|
169
|
-
* @return {Promise<any>}
|
|
170
|
-
*/
|
|
171
149
|
async query(query, values) {
|
|
172
150
|
const queryWithParams = applyParams(query, values);
|
|
173
151
|
const cancelObj = {};
|
|
@@ -176,9 +154,6 @@ class JDBCDriver extends query_orchestrator_1.BaseDriver {
|
|
|
176
154
|
() => cancelObj.cancel && cancelObj.cancel() || Promise.reject(new Error('Statement is not ready'));
|
|
177
155
|
return promise;
|
|
178
156
|
}
|
|
179
|
-
/**
|
|
180
|
-
* @protected
|
|
181
|
-
*/
|
|
182
157
|
async withConnection(fn) {
|
|
183
158
|
const conn = await this.pool.acquire();
|
|
184
159
|
try {
|
|
@@ -188,9 +163,6 @@ class JDBCDriver extends query_orchestrator_1.BaseDriver {
|
|
|
188
163
|
await this.pool.release(conn);
|
|
189
164
|
}
|
|
190
165
|
}
|
|
191
|
-
/**
|
|
192
|
-
* @protected
|
|
193
|
-
*/
|
|
194
166
|
async queryPromised(query, cancelObj, options) {
|
|
195
167
|
options = options || {};
|
|
196
168
|
try {
|
|
@@ -215,9 +187,6 @@ class JDBCDriver extends query_orchestrator_1.BaseDriver {
|
|
|
215
187
|
}
|
|
216
188
|
}
|
|
217
189
|
}
|
|
218
|
-
/**
|
|
219
|
-
* @protected
|
|
220
|
-
*/
|
|
221
190
|
async executeStatement(conn, query, cancelObj) {
|
|
222
191
|
const createStatementAsync = util_1.promisify(conn.createStatement.bind(conn));
|
|
223
192
|
const statement = await createStatementAsync();
|
|
@@ -232,26 +201,13 @@ class JDBCDriver extends query_orchestrator_1.BaseDriver {
|
|
|
232
201
|
(() => Promise.resolve(resultSet));
|
|
233
202
|
return toObjArrayAsync();
|
|
234
203
|
}
|
|
235
|
-
/**
|
|
236
|
-
* @public
|
|
237
|
-
* @return {Promise<void>}
|
|
238
|
-
*/
|
|
239
204
|
async release() {
|
|
240
205
|
await this.pool.drain();
|
|
241
206
|
await this.pool.clear();
|
|
242
207
|
}
|
|
243
|
-
/**
|
|
244
|
-
* @public
|
|
245
|
-
* @return {string[]}
|
|
246
|
-
*/
|
|
247
208
|
static getSupportedDrivers() {
|
|
248
209
|
return Object.keys(supported_drivers_1.SupportedDrivers);
|
|
249
210
|
}
|
|
250
|
-
/**
|
|
251
|
-
* @public
|
|
252
|
-
* @param {string} dbType
|
|
253
|
-
* @return {Object}
|
|
254
|
-
*/
|
|
255
211
|
static dbTypeDescription(dbType) {
|
|
256
212
|
return supported_drivers_1.SupportedDrivers[dbType];
|
|
257
213
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JDBCDriver.js","sourceRoot":"","sources":["../../src/JDBCDriver.
|
|
1
|
+
{"version":3,"file":"JDBCDriver.js","sourceRoot":"","sources":["../../src/JDBCDriver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2EAA2E;AAC3E,6DAAyD;AAEzD,qDAAuC;AACvC,+BAAiC;AACjC,gEAA0D;AAE1D,2DAA+E;AAI/E,MAAM,aAAa,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;AACxD,MAAM,UAAU,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;AAClD,MAAM,gBAAgB,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;AAC9D,MAAM,KAAK,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AACxC,MAAM,GAAG,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAEvC,IAAI,UAAU,GAAyB,IAAI,CAAC;AAE5C,MAAM,OAAO,GAAG,CAAC,eAAoB,EAAE,EAAE;IACvC,IAAI,CAAC,UAAU,EAAE;QACf,UAAU,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,GAAG,CAAC,CAAC,GAAQ,EAAE,UAAe,EAAE,EAAE;gBAChC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,8BAA8B,CAAC,EAAE;oBAChE,MAAM,CAAC,GAAG,CAAC,CAAC;iBACb;qBAAM;oBACL,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,EAAE;wBACzB,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;wBACxB,MAAM,SAAS,GAAG,CAAC,UAAU,IAAI,UAAU,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC;wBAC3F,KAAK,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;qBACjC;oBACD,OAAO,EAAE,CAAC;iBACX;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;KACJ;IACD,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,KAAa,EAAE,MAAsB,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAE/F,+BAA+B;AAC/B,UAAU,CAAC,SAAS,CAAC,gBAAgB,GAAG,gBAAS,CAAC,UAAU,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;AACpF,qCAAqC;AACrC,gBAAgB,CAAC,SAAS,CAAC,eAAe,GAAG,gBAAS,CAAC,gBAAgB,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;AAC9F,gBAAgB,CAAC,SAAS,CAAC,cAAc,GAAG,gBAAS,CAAC,gBAAgB,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;AAM5F,MAAa,UAAW,SAAQ,wBAAU;IAOxC,YAAmB,SAA2C,EAAE;QAC9D,KAAK,EAAE,CAAC;QAER,MAAM,EAAE,WAAW,EAAE,GAAG,SAAS,EAAE,GAAG,MAAM,IAAI,EAAE,CAAC;QAEnD,MAAM,iBAAiB,GAAG,UAAU,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,CAAW,CAAC,CAAC;QAEhH,IAAI,CAAC,MAAM,GAAG;YACZ,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;YAClC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,iBAAiB,IAAI,iBAAiB,CAAC,OAAO,EAAE;YACpF,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,iBAAiB,IAAI,iBAAiB,CAAC,WAAW;YAChG,UAAU,EAAE,iBAAiB,IAAI,iBAAiB,CAAC,UAAU;YAC7D,GAAG,SAAS;SACc,CAAC;QAE7B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YAC3B,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;SACpD;QAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;SAC7C;QAED,IAAI,CAAC,IAAI,GAAG,sBAAW,CAAC,UAAU,CAAC;YACjC,MAAM,EAAE,KAAK,IAAI,EAAE;gBACjB,MAAM,OAAO,CAAC,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;gBAE/C,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;oBACnB,iBAAiB;oBACjB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;iBAC3C;gBAED,MAAM,aAAa,GAAG,gBAAS,CAAC,aAAa,CAAC,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;gBACjF,OAAO,IAAI,UAAU,CAAC,MAAM,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;YAC9E,CAAC;YACD,sDAAsD;YACtD,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,CAAC,gBAAS,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC3E,QAAQ,EAAE,CAAC,UAAU,EAAE,EAAE;gBACvB,MAAM,OAAO,GAAG,gBAAS,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;gBAC/D,IAAI;oBACF,OAAO,OAAO,CAAC,IAAI,CAAC,qBAAqB,EAAE,GAAG,IAAI,CAAC,CAAC;iBACrD;gBAAC,OAAO,CAAC,EAAE;oBACV,OAAO,KAAK,CAAC;iBACd;YACH,CAAC;SACF,EAAE;YACD,GAAG,EAAE,CAAC;YACN,GAAG,EACD,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,EAAE,CAAC;gBAC9E,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,CAAC;YAC9B,yBAAyB,EAAE,KAAK;YAChC,qBAAqB,EAAE,KAAK;YAC5B,iBAAiB,EAAE,KAAK;YACxB,YAAY,EAAE,IAAI;YAClB,oBAAoB,EAAE,KAAK;YAC3B,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC;SACvB,CAAiB,CAAC;IACrB,CAAC;IAES,KAAK,CAAC,kBAAkB;QAChC,OAAO,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC;IACrC,CAAC;IAES,iBAAiB;QACzB,MAAM,IAAI,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;QACjC,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;QACvD,MAAM,UAAU,GAAG,IAAI,UAAU,EAAE,CAAC;QAEpC,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;YAClE,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;SACjC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAEM,KAAK,CAAC,cAAc;QACzB,IAAI,GAAG,CAAC;QACR,IAAI,UAAU,CAAC;QACf,IAAI;YACF,UAAU,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;SAChD;QAAC,OAAO,CAAM,EAAE;YACf,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC;SACjB;QACD,IAAI,GAAG,EAAE;YACP,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;SACtB;aAAM;YACL,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;SAC9C;IACH,CAAC;IAES,wBAAwB;QAChC,MAAM,iBAAiB,GAAG,UAAU,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC3E,OAAO,IAAI,CAAC,MAAM,CAAC,wBAAwB;YACzC,iBAAiB,IAAI,iBAAiB,CAAC,wBAAwB;YAC/D,EAAE,CAAC;IACP,CAAC;IAEM,KAAK,CAAC,KAAK,CAAc,KAAa,EAAE,MAAiB;QAC9D,MAAM,eAAe,GAAG,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACnD,MAAM,SAAS,GAAwB,EAAE,CAAC;QAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,EAAE,SAAS,EAAE,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC;QAC/F,OAAkC,CAAC,MAAM;YACxC,GAAG,EAAE,CAAC,SAAS,CAAC,MAAM,IAAI,SAAS,CAAC,MAAM,EAAE,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC,CAAC;QACtG,OAAO,OAAO,CAAC;IACjB,CAAC;IAES,KAAK,CAAC,cAAc,CAAqB,EAAK;QACtD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAEvC,IAAI;YACF,OAAO,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC;SACvB;gBAAS;YACR,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAC/B;IACH,CAAC;IAES,KAAK,CAAC,aAAa,CAAC,KAAa,EAAE,SAAc,EAAE,OAAY;QACvE,OAAO,GAAG,OAAO,IAAI,EAAE,CAAC;QACxB,IAAI;YACF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YACvC,IAAI;gBACF,MAAM,wBAAwB,GAAG,OAAO,CAAC,wBAAwB,IAAI,EAAE,CAAC;gBACxE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,wBAAwB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBACxD,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,wBAAwB,CAAC,CAAC,CAAC,CAAC,CAAC;iBAChE;gBACD,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;aAC5D;oBAAS;gBACR,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;aAC/B;SACF;QAAC,OAAO,EAAO,EAAE;YAChB,IAAI,EAAE,CAAC,KAAK,EAAE;gBACZ,MAAM,IAAI,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC;aAC5C;iBAAM;gBACL,MAAM,EAAE,CAAC;aACV;SACF;IACH,CAAC;IAES,KAAK,CAAC,gBAAgB,CAAC,IAAS,EAAE,KAAU,EAAE,SAAe;QACrE,MAAM,oBAAoB,GAAG,gBAAS,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACxE,MAAM,SAAS,GAAG,MAAM,oBAAoB,EAAE,CAAC;QAC/C,IAAI,SAAS,EAAE;YACb,SAAS,CAAC,MAAM,GAAG,gBAAS,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;SAChE;QACD,MAAM,eAAe,GAAG,gBAAS,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QAC7E,MAAM,eAAe,CAAC,GAAG,CAAC,CAAC;QAC3B,MAAM,iBAAiB,GAAG,gBAAS,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QACvE,MAAM,SAAS,GAAG,MAAM,iBAAiB,CAAC,KAAK,CAAC,CAAC;QACjD,MAAM,eAAe,GACnB,SAAS,CAAC,UAAU,IAAI,gBAAS,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACvE,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;QAErC,OAAO,eAAe,EAAE,CAAC;IAC3B,CAAC;IAEM,KAAK,CAAC,OAAO;QAClB,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QACxB,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;IAC1B,CAAC;IAEM,MAAM,CAAC,mBAAmB;QAC/B,OAAO,MAAM,CAAC,IAAI,CAAC,oCAAgB,CAAC,CAAC;IACvC,CAAC;IAEM,MAAM,CAAC,iBAAiB,CAAC,MAAc;QAC5C,OAAO,oCAAgB,CAAC,MAAM,CAAC,CAAC;IAClC,CAAC;CACF;AA9KD,gCA8KC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
interface DriverOptionsInterface {
|
|
1
|
+
export interface DriverOptionsInterface {
|
|
2
2
|
driverClass: string;
|
|
3
3
|
prepareConnectionQueries: string[];
|
|
4
4
|
mavenDependency: Record<string, any>;
|
|
@@ -6,5 +6,4 @@ interface DriverOptionsInterface {
|
|
|
6
6
|
jdbcUrl: () => string;
|
|
7
7
|
}
|
|
8
8
|
export declare const SupportedDrivers: Record<string, DriverOptionsInterface>;
|
|
9
|
-
export {};
|
|
10
9
|
//# sourceMappingURL=supported-drivers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"supported-drivers.d.ts","sourceRoot":"","sources":["../../src/supported-drivers.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"supported-drivers.d.ts","sourceRoot":"","sources":["../../src/supported-drivers.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,sBAAsB;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACrC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,OAAO,EAAE,MAAM,MAAM,CAAC;CACvB;AAED,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,CA0DnE,CAAC"}
|
package/dist/src/types.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Options } from 'generic-pool';
|
|
1
2
|
export declare type JDBCDriverConfiguration = {
|
|
2
3
|
database: string;
|
|
3
4
|
dbType: string;
|
|
@@ -5,5 +6,8 @@ export declare type JDBCDriverConfiguration = {
|
|
|
5
6
|
drivername: string;
|
|
6
7
|
customClassPath?: string;
|
|
7
8
|
properties: Record<string, any>;
|
|
9
|
+
maxPoolSize?: number;
|
|
10
|
+
poolOptions?: Options;
|
|
11
|
+
prepareConnectionQueries?: string[];
|
|
8
12
|
};
|
|
9
13
|
//# sourceMappingURL=types.d.ts.map
|
package/dist/src/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,oBAAY,uBAAuB,GAAG;IACpC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,oBAAY,uBAAuB,GAAG;IACpC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC;CACrC,CAAC"}
|
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.30.
|
|
5
|
+
"version": "0.30.69",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
8
8
|
"url": "https://github.com/cube-js/cube.js.git",
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
"index.js"
|
|
26
26
|
],
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@cubejs-backend/
|
|
28
|
+
"@cubejs-backend/base-driver": "^0.30.69",
|
|
29
29
|
"generic-pool": "^3.1.7",
|
|
30
30
|
"node-java-maven": "^0.1.2",
|
|
31
31
|
"sqlstring": "^2.3.0"
|
|
@@ -43,10 +43,11 @@
|
|
|
43
43
|
},
|
|
44
44
|
"devDependencies": {
|
|
45
45
|
"@cubejs-backend/linter": "^0.30.0",
|
|
46
|
+
"@cubejs-backend/shared": "^0.30.69",
|
|
46
47
|
"@types/generic-pool": "^3.1.9",
|
|
47
48
|
"@types/node": "^12",
|
|
48
49
|
"@types/sqlstring": "^2.3.0",
|
|
49
50
|
"typescript": "~4.1.5"
|
|
50
51
|
},
|
|
51
|
-
"gitHead": "
|
|
52
|
+
"gitHead": "f37e23c24d10ea8ae9b5aa8bf3a8823ac299aab4"
|
|
52
53
|
}
|