@cubejs-backend/jdbc-driver 0.29.35 → 0.29.48
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 +27 -0
- package/dist/src/JDBCDriver.d.ts.map +1 -1
- package/dist/src/JDBCDriver.js +15 -7
- package/dist/src/JDBCDriver.js.map +1 -1
- package/package.json +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,33 @@
|
|
|
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.29.48](https://github.com/cube-js/cube.js/compare/v0.29.47...v0.29.48) (2022-04-14)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @cubejs-backend/jdbc-driver
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
## [0.29.41](https://github.com/cube-js/cube.js/compare/v0.29.40...v0.29.41) (2022-04-03)
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
### Bug Fixes
|
|
18
|
+
|
|
19
|
+
* **jdbc-driver:** Handle mvn error for empty java dependencies ([#4307](https://github.com/cube-js/cube.js/issues/4307)) ([9e12511](https://github.com/cube-js/cube.js/commit/9e12511e29655d855846781b90db6fd2e43ddff4))
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
## [0.29.37](https://github.com/cube-js/cube.js/compare/v0.29.36...v0.29.37) (2022-03-29)
|
|
26
|
+
|
|
27
|
+
**Note:** Version bump only for package @cubejs-backend/jdbc-driver
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
|
|
32
|
+
|
|
6
33
|
## [0.29.35](https://github.com/cube-js/cube.js/compare/v0.29.34...v0.29.35) (2022-03-24)
|
|
7
34
|
|
|
8
35
|
**Note:** Version bump only for package @cubejs-backend/jdbc-driver
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JDBCDriver.d.ts","sourceRoot":"","sources":["../../src/JDBCDriver.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"JDBCDriver.d.ts","sourceRoot":"","sources":["../../src/JDBCDriver.js"],"names":[],"mappings":"AA8CA;IAuLE;;;OAGG;IACH,qCAFY,MAAM,EAAE,CAInB;IAED;;;;OAIG;IACH,wCAHW,MAAM,GACL,MAAM,CAIjB;IArMD;;OAEG;IACH,mEAwDC;IAjDC,iBAAiB;IACjB;;;;;;;MAMC;IAUD,iBAAiB;IACjB,sCA8BE;IAzBI,iBAAiB;IACjB,yBAAyC;IA2BjD;;;OAGG;IACH,gCAFY,QAAQ,MAAM,GAAC,SAAS,CAAC,CAIpC;IAED;;OAEG;IACH,mCAUC;IAUD;;OAEG;IACH,0CAKC;IAeD;;OAEG;IACH,gDAQC;IAED;;OAEG;IACH,gFAoBC;IAED;;OAEG;IACH,gFAeC;CA2BF"}
|
package/dist/src/JDBCDriver.js
CHANGED
|
@@ -33,16 +33,24 @@ const DriverManager = require('jdbc/lib/drivermanager');
|
|
|
33
33
|
const Connection = require('jdbc/lib/connection');
|
|
34
34
|
const DatabaseMetaData = require('jdbc/lib/databasemetadata');
|
|
35
35
|
const jinst = require('jdbc/lib/jinst');
|
|
36
|
-
const mvn =
|
|
36
|
+
const mvn = require('node-java-maven');
|
|
37
37
|
let mvnPromise = null;
|
|
38
38
|
const initMvn = (customClassPath) => {
|
|
39
39
|
if (!mvnPromise) {
|
|
40
|
-
mvnPromise =
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
40
|
+
mvnPromise = new Promise((resolve, reject) => {
|
|
41
|
+
mvn((err, mvnResults) => {
|
|
42
|
+
if (err && !err.message.includes('Could not find java property')) {
|
|
43
|
+
reject(err);
|
|
44
|
+
}
|
|
45
|
+
else {
|
|
46
|
+
if (!jinst.isJvmCreated()) {
|
|
47
|
+
jinst.addOption('-Xrs');
|
|
48
|
+
const classPath = (mvnResults && mvnResults.classpath || []).concat(customClassPath || []);
|
|
49
|
+
jinst.setupClasspath(classPath);
|
|
50
|
+
}
|
|
51
|
+
resolve();
|
|
52
|
+
}
|
|
53
|
+
});
|
|
46
54
|
});
|
|
47
55
|
}
|
|
48
56
|
return mvnPromise;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JDBCDriver.js","sourceRoot":"","sources":["../../src/JDBCDriver.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2EAA2E;AAC3E,2EAAgE;AAChE,qDAAuC;AACvC,+BAAiC;AACjC,gEAAuC;AAEvC,2DAAuD;AAIvD,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,
|
|
1
|
+
{"version":3,"file":"JDBCDriver.js","sourceRoot":"","sources":["../../src/JDBCDriver.js"],"names":[],"mappings":"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"}
|
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.29.
|
|
5
|
+
"version": "0.29.48",
|
|
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/query-orchestrator": "^0.29.
|
|
28
|
+
"@cubejs-backend/query-orchestrator": "^0.29.48",
|
|
29
29
|
"generic-pool": "^3.1.7",
|
|
30
30
|
"node-java-maven": "^0.1.2",
|
|
31
31
|
"sqlstring": "^2.3.0"
|
|
@@ -48,5 +48,5 @@
|
|
|
48
48
|
"@types/sqlstring": "^2.3.0",
|
|
49
49
|
"typescript": "~4.1.5"
|
|
50
50
|
},
|
|
51
|
-
"gitHead": "
|
|
51
|
+
"gitHead": "1fa9b5fe1c15ae2e790c101381d127d691c944ac"
|
|
52
52
|
}
|