@cubejs-backend/jdbc-driver 0.33.0 → 0.33.3

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 (3) hide show
  1. package/dist/src/JDBCDriver.js +1 -1
  2. package/dist/src/JDBCDriver.js.map +1 -1
  3. package/package.json +3 -3
package/dist/src/JDBCDriver.js CHANGED
@@ -137,7 +137,7 @@ class JDBCDriver extends base_driver_1.BaseDriver {
137
137
  softIdleTimeoutMillis: 30000,
138
138
  idleTimeoutMillis: 30000,
139
139
  testOnBorrow: true,
140
- acquireTimeoutMillis: 20000,
140
+ acquireTimeoutMillis: 120000,
141
141
  ...(poolOptions || {})
142
142
  });
143
143
  }
package/dist/src/JDBCDriver.js.map CHANGED
@@ -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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"}
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.33.0",
5
+ "version": "0.33.3",
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.33.0",
28
+ "@cubejs-backend/base-driver": "^0.33.2",
29
29
  "generic-pool": "^3.1.7",
30
30
  "node-java-maven": "^0.1.2",
31
31
  "sqlstring": "^2.3.0"
@@ -49,5 +49,5 @@
49
49
  "@types/sqlstring": "^2.3.0",
50
50
  "typescript": "~4.9.5"
51
51
  },
52
- "gitHead": "2cd366915c99b15477142bf6fe4af52c0fc8d0c6"
52
+ "gitHead": "1c0b1928bd939a36d2fd00ac84962f593e4af137"
53
53
  }