@cubejs-backend/jdbc-driver 0.30.73 → 0.31.2

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 CHANGED
@@ -3,6 +3,25 @@
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.31.2](https://github.com/cube-js/cube.js/compare/v0.31.1...v0.31.2) (2022-10-08)
7
+
8
+ **Note:** Version bump only for package @cubejs-backend/jdbc-driver
9
+
10
+
11
+
12
+
13
+
14
+ # [0.31.0](https://github.com/cube-js/cube.js/compare/v0.30.75...v0.31.0) (2022-10-03)
15
+
16
+
17
+ ### Features
18
+
19
+ * multiple data source ([#5326](https://github.com/cube-js/cube.js/issues/5326)) ([334af8c](https://github.com/cube-js/cube.js/commit/334af8c56cd02ae551844e9d1e9ab5e107fb1555))
20
+
21
+
22
+
23
+
24
+
6
25
  ## [0.30.73](https://github.com/cube-js/cube.js/compare/v0.30.72...v0.30.73) (2022-09-19)
7
26
 
8
27
  **Note:** Version bump only for package @cubejs-backend/jdbc-driver
@@ -9,7 +9,10 @@ export declare class JDBCDriver extends BaseDriver {
9
9
  protected readonly config: JDBCDriverConfiguration;
10
10
  protected pool: ExtendedPool;
11
11
  protected jdbcProps: any;
12
- constructor(config?: Partial<JDBCDriverConfiguration>);
12
+ constructor(config?: Partial<JDBCDriverConfiguration> & {
13
+ dataSource?: string;
14
+ maxPoolSize?: number;
15
+ });
13
16
  protected getCustomClassPath(): Promise<string | undefined>;
14
17
  protected getJdbcProperties(): any;
15
18
  testConnection(): Promise<void>;
@@ -1 +1 @@
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"}
1
+ {"version":3,"file":"JDBCDriver.d.ts","sourceRoot":"","sources":["../../src/JDBCDriver.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAGzD,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;gBAGvB,MAAM,GAAE,OAAO,CAAC,uBAAuB,CAAC,GAAG;QACzC,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,WAAW,CAAC,EAAE,MAAM,CAAC;KACjB;cAuEQ,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"}
@@ -24,6 +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 shared_1 = require("@cubejs-backend/shared");
27
28
  const base_driver_1 = require("@cubejs-backend/base-driver");
28
29
  const SqlString = __importStar(require("sqlstring"));
29
30
  const util_1 = require("util");
@@ -64,12 +65,16 @@ DatabaseMetaData.prototype.getTablesAsync = util_1.promisify(DatabaseMetaData.pr
64
65
  class JDBCDriver extends base_driver_1.BaseDriver {
65
66
  constructor(config = {}) {
66
67
  super();
67
- const { poolOptions, ...dbOptions } = config || {};
68
- const dbTypeDescription = JDBCDriver.dbTypeDescription((config.dbType || process.env.CUBEJS_DB_TYPE));
68
+ const dataSource = config.dataSource ||
69
+ shared_1.assertDataSource('default');
70
+ const { poolOptions, ...dbOptions } = config;
71
+ const dbTypeDescription = JDBCDriver.dbTypeDescription((config.dbType || shared_1.getEnv('dbType', { dataSource })));
69
72
  this.config = {
70
- dbType: process.env.CUBEJS_DB_TYPE,
71
- url: process.env.CUBEJS_JDBC_URL || dbTypeDescription && dbTypeDescription.jdbcUrl(),
72
- drivername: process.env.CUBEJS_JDBC_DRIVER || dbTypeDescription && dbTypeDescription.driverClass,
73
+ dbType: shared_1.getEnv('dbType', { dataSource }),
74
+ url: shared_1.getEnv('jdbcUrl', { dataSource }) ||
75
+ dbTypeDescription && dbTypeDescription.jdbcUrl(),
76
+ drivername: shared_1.getEnv('jdbcDriver', { dataSource }) ||
77
+ dbTypeDescription && dbTypeDescription.driverClass,
73
78
  properties: dbTypeDescription && dbTypeDescription.properties,
74
79
  ...dbOptions
75
80
  };
@@ -102,8 +107,9 @@ class JDBCDriver extends base_driver_1.BaseDriver {
102
107
  }
103
108
  }, {
104
109
  min: 0,
105
- max: process.env.CUBEJS_DB_MAX_POOL && parseInt(process.env.CUBEJS_DB_MAX_POOL, 10) ||
106
- this.config.maxPoolSize || 8,
110
+ max: config.maxPoolSize ||
111
+ shared_1.getEnv('dbMaxPoolSize', { dataSource }) ||
112
+ 8,
107
113
  evictionRunIntervalMillis: 10000,
108
114
  softIdleTimeoutMillis: 30000,
109
115
  idleTimeoutMillis: 30000,
@@ -1 +1 @@
1
- {"version":3,"file":"JDBCDriver.js","sourceRoot":"","sources":["../../src/JDBCDriver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"JDBCDriver.js","sourceRoot":"","sources":["../../src/JDBCDriver.ts"],"names":[],"mappings":"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"}
@@ -6,7 +6,6 @@ export declare type JDBCDriverConfiguration = {
6
6
  drivername: string;
7
7
  customClassPath?: string;
8
8
  properties: Record<string, any>;
9
- maxPoolSize?: number;
10
9
  poolOptions?: Options;
11
10
  prepareConnectionQueries?: string[];
12
11
  };
@@ -1 +1 @@
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"}
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,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.73",
5
+ "version": "0.31.2",
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/base-driver": "^0.30.73",
28
+ "@cubejs-backend/base-driver": "^0.31.2",
29
29
  "generic-pool": "^3.1.7",
30
30
  "node-java-maven": "^0.1.2",
31
31
  "sqlstring": "^2.3.0"
@@ -42,12 +42,12 @@
42
42
  "testEnvironment": "node"
43
43
  },
44
44
  "devDependencies": {
45
- "@cubejs-backend/linter": "^0.30.0",
46
- "@cubejs-backend/shared": "^0.30.69",
45
+ "@cubejs-backend/linter": "^0.31.0",
46
+ "@cubejs-backend/shared": "^0.31.0",
47
47
  "@types/generic-pool": "^3.1.9",
48
48
  "@types/node": "^12",
49
49
  "@types/sqlstring": "^2.3.0",
50
50
  "typescript": "~4.1.5"
51
51
  },
52
- "gitHead": "d47987e8eab041fd9b5113feb3ab8f35afe38e16"
52
+ "gitHead": "bba50dae04127f8fa90de13a872c86041a333984"
53
53
  }