@cubejs-backend/mssql-driver 1.6.13 → 1.6.15
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/MSSqlDriver.d.ts +6 -1
- package/dist/src/MSSqlDriver.d.ts.map +1 -1
- package/dist/src/MSSqlDriver.js +15 -10
- package/dist/src/MSSqlDriver.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 +12 -9
- package/dist/src/QueryStream.js.map +1 -1
- package/package.json +4 -4
|
@@ -14,7 +14,7 @@ export type MSSqlDriverConfiguration = Omit<MsSQLConfig, 'server'> & {
|
|
|
14
14
|
* MS SQL driver class.
|
|
15
15
|
*/
|
|
16
16
|
export declare class MSSqlDriver extends BaseDriver implements DriverInterface {
|
|
17
|
-
private readonly
|
|
17
|
+
private readonly pool;
|
|
18
18
|
private readonly initialConnectPromise;
|
|
19
19
|
private readonly config;
|
|
20
20
|
/**
|
|
@@ -33,6 +33,10 @@ export declare class MSSqlDriver extends BaseDriver implements DriverInterface {
|
|
|
33
33
|
* Max pool size value for the [cube]<-->[db] pool.
|
|
34
34
|
*/
|
|
35
35
|
maxPoolSize?: number;
|
|
36
|
+
/**
|
|
37
|
+
* Min pool size value for the [cube]<-->[db] pool.
|
|
38
|
+
*/
|
|
39
|
+
minPoolSize?: number;
|
|
36
40
|
/**
|
|
37
41
|
* Time to wait for a response from a connection after validation
|
|
38
42
|
* request before determining it as not valid. Default - 10000 ms.
|
|
@@ -91,6 +95,7 @@ export declare class MSSqlDriver extends BaseDriver implements DriverInterface {
|
|
|
91
95
|
query: string;
|
|
92
96
|
limit: number;
|
|
93
97
|
}): void;
|
|
98
|
+
release(): Promise<void>;
|
|
94
99
|
capabilities(): DriverCapabilities;
|
|
95
100
|
}
|
|
96
101
|
//# sourceMappingURL=MSSqlDriver.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MSSqlDriver.d.ts","sourceRoot":"","sources":["../../src/MSSqlDriver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAY,EAAkB,MAAM,IAAI,WAAW,EAAE,MAAM,OAAO,CAAC;AAKnE,OAAO,EACL,UAAU,EACV,eAAe,EACf,aAAa,EACb,2BAA2B,EAC3B,cAAc,EACd,kBAAkB,EAClB,0BAA0B,EAE1B,mBAAmB,EACpB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"MSSqlDriver.d.ts","sourceRoot":"","sources":["../../src/MSSqlDriver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAY,EAAkB,MAAM,IAAI,WAAW,EAAE,MAAM,OAAO,CAAC;AAKnE,OAAO,EACL,UAAU,EACV,eAAe,EACf,aAAa,EACb,2BAA2B,EAC3B,cAAc,EACd,kBAAkB,EAClB,0BAA0B,EAE1B,mBAAmB,EACpB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,WAAW,EAAgB,MAAM,eAAe,CAAC;AAoB1D,MAAM,MAAM,wBAAwB,GAAG,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,GAAG;IACnE,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAgBF;;GAEG;AACH,qBAAa,WAAY,SAAQ,UAAW,YAAW,eAAe;IACpE,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiB;IAEtC,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAA0B;IAEhE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA2B;IAElD;;OAEG;WACW,qBAAqB;IAInC;;OAEG;gBACgB,MAAM,GAAE,wBAAwB,GAAG;QAClD;;WAEG;QACH,UAAU,CAAC,EAAE,MAAM,CAAC;QAEpB;;WAEG;QACH,WAAW,CAAC,EAAE,MAAM,CAAC;QAErB;;WAEG;QACH,WAAW,CAAC,EAAE,MAAM,CAAC;QAErB;;;WAGG;QACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;QAC/B,MAAM,CAAC,EAAE,MAAM,CAAC;KACZ;IA0CR;;;;OAIG;WACW,kBAAkB;IAWnB,cAAc;IAK3B;;;;;;;OAOG;IACU,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,aAAa,EAAE,EAAE,aAAa;;;;;IA+BtF;;;;;;;;;;;;;;;OAeG;IACH,OAAO,CAAC,SAAS;IAsEJ,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE;IAkB5C,KAAK,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAIlB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAkBvE,cAAc,CAAC,UAAU,EAAE,MAAM;IAO3B,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYhE,sBAAsB,IAAI,MAAM;IAY1B,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,2BAA2B,GAAG,OAAO,CAAC,0BAA0B,CAAC;IAiB9I,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;cAIlC,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,mBAAmB;IAIpH,QAAQ,IAAI,OAAO;IAInB,kBAAkB,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAC;IAI1C,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvC,YAAY,IAAI,kBAAkB;CAK1C"}
|
package/dist/src/MSSqlDriver.js
CHANGED
|
@@ -65,7 +65,7 @@ const MSSqlToGenericType = {
|
|
|
65
65
|
* MS SQL driver class.
|
|
66
66
|
*/
|
|
67
67
|
class MSSqlDriver extends base_driver_1.BaseDriver {
|
|
68
|
-
|
|
68
|
+
pool;
|
|
69
69
|
initialConnectPromise;
|
|
70
70
|
config;
|
|
71
71
|
/**
|
|
@@ -83,9 +83,6 @@ class MSSqlDriver extends base_driver_1.BaseDriver {
|
|
|
83
83
|
});
|
|
84
84
|
const dataSource = config.dataSource ||
|
|
85
85
|
(0, shared_1.assertDataSource)('default');
|
|
86
|
-
/**
|
|
87
|
-
* @type {import('mssql').config}
|
|
88
|
-
*/
|
|
89
86
|
this.config = {
|
|
90
87
|
readOnly: true,
|
|
91
88
|
server: (0, shared_1.getEnv)('dbHost', { dataSource }),
|
|
@@ -97,21 +94,23 @@ class MSSqlDriver extends base_driver_1.BaseDriver {
|
|
|
97
94
|
requestTimeout: (0, shared_1.getEnv)('dbQueryTimeout') * 1000,
|
|
98
95
|
options: {
|
|
99
96
|
encrypt: (0, shared_1.getEnv)('dbSsl', { dataSource }),
|
|
100
|
-
useUTC:
|
|
97
|
+
useUTC: true
|
|
101
98
|
},
|
|
102
99
|
pool: {
|
|
103
100
|
max: config.maxPoolSize ||
|
|
104
101
|
(0, shared_1.getEnv)('dbMaxPoolSize', { dataSource }) ||
|
|
105
102
|
8,
|
|
106
|
-
min:
|
|
103
|
+
min: config.minPoolSize ||
|
|
104
|
+
(0, shared_1.getEnv)('dbMinPoolSize', { dataSource }) ||
|
|
105
|
+
0,
|
|
107
106
|
idleTimeoutMillis: 30 * 1000,
|
|
108
107
|
acquireTimeoutMillis: 20 * 1000
|
|
109
108
|
},
|
|
110
109
|
...config
|
|
111
110
|
};
|
|
112
|
-
const { readOnly, ...poolConfig } = this.config;
|
|
113
|
-
this.
|
|
114
|
-
this.initialConnectPromise = this.
|
|
111
|
+
const { readOnly: _, ...poolConfig } = this.config;
|
|
112
|
+
this.pool = new mssql_1.ConnectionPool(poolConfig);
|
|
113
|
+
this.initialConnectPromise = this.pool.connect();
|
|
115
114
|
}
|
|
116
115
|
/**
|
|
117
116
|
* Returns the configurable driver options
|
|
@@ -260,7 +259,10 @@ class MSSqlDriver extends base_driver_1.BaseDriver {
|
|
|
260
259
|
(values || []).forEach((v, i) => request.input(`_${i + 1}`, v));
|
|
261
260
|
// TODO time zone UTC set in driver ?
|
|
262
261
|
cancelFn = () => request.cancel();
|
|
263
|
-
return request.query(query).then(res =>
|
|
262
|
+
return request.query(query).then(res => {
|
|
263
|
+
res.recordset?.forEach(QueryStream_1.transformRow);
|
|
264
|
+
return res.recordset;
|
|
265
|
+
});
|
|
264
266
|
});
|
|
265
267
|
promise.cancel = () => cancelFn && cancelFn();
|
|
266
268
|
return promise;
|
|
@@ -328,6 +330,9 @@ class MSSqlDriver extends base_driver_1.BaseDriver {
|
|
|
328
330
|
wrapQueryWithLimit(query) {
|
|
329
331
|
query.query = `SELECT TOP ${query.limit} * FROM (${query.query}) AS t`;
|
|
330
332
|
}
|
|
333
|
+
async release() {
|
|
334
|
+
await this.pool.close();
|
|
335
|
+
}
|
|
331
336
|
capabilities() {
|
|
332
337
|
return {
|
|
333
338
|
incrementalSchemaLoading: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MSSqlDriver.js","sourceRoot":"","sources":["../../src/MSSqlDriver.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,+CAAmE;AACnE,mDAGgC;AAChC,6DAUqC;AACrC,+
|
|
1
|
+
{"version":3,"file":"MSSqlDriver.js","sourceRoot":"","sources":["../../src/MSSqlDriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { Readable } from 'stream';
|
|
3
3
|
import sql from 'mssql';
|
|
4
|
+
export declare function transformRow(row: Record<string, any>): void;
|
|
4
5
|
/**
|
|
5
6
|
* MS-SQL query stream class.
|
|
6
7
|
*/
|
|
@@ -15,7 +16,6 @@ export declare class QueryStream extends Readable {
|
|
|
15
16
|
* @override
|
|
16
17
|
*/
|
|
17
18
|
_read(toRead: number): void;
|
|
18
|
-
private transformRow;
|
|
19
19
|
/**
|
|
20
20
|
* @override
|
|
21
21
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryStream.d.ts","sourceRoot":"","sources":["../../src/QueryStream.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,GAAG,MAAM,OAAO,CAAC;AAKxB;;GAEG;AACH,qBAAa,WAAY,SAAQ,QAAQ;IACvC,OAAO,CAAC,OAAO,CAAqB;IAEpC,OAAO,CAAC,MAAM,CAAa;IAE3B;;OAEG;gBACgB,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM;IAsB9D;;OAEG;IACI,KAAK,CAAC,MAAM,EAAE,MAAM;IAK3B
|
|
1
|
+
{"version":3,"file":"QueryStream.d.ts","sourceRoot":"","sources":["../../src/QueryStream.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,GAAG,MAAM,OAAO,CAAC;AAKxB,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,QAQpD;AAED;;GAEG;AACH,qBAAa,WAAY,SAAQ,QAAQ;IACvC,OAAO,CAAC,OAAO,CAAqB;IAEpC,OAAO,CAAC,MAAM,CAAa;IAE3B;;OAEG;gBACgB,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM;IAsB9D;;OAEG;IACI,KAAK,CAAC,MAAM,EAAE,MAAM;IAK3B;;OAEG;IACI,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,gBAAgB;CAKvD"}
|
package/dist/src/QueryStream.js
CHANGED
|
@@ -1,8 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.QueryStream = void 0;
|
|
3
|
+
exports.QueryStream = exports.transformRow = void 0;
|
|
4
4
|
const stream_1 = require("stream");
|
|
5
5
|
const shared_1 = require("@cubejs-backend/shared");
|
|
6
|
+
function transformRow(row) {
|
|
7
|
+
for (const [key, value] of Object.entries(row)) {
|
|
8
|
+
if (value instanceof Date) {
|
|
9
|
+
// toJSON() returns an ISO-8601 UTC string (e.g. "2017-01-03T00:00:00.000Z")
|
|
10
|
+
// because useUTC: true makes tedious construct Date objects via Date.UTC(),
|
|
11
|
+
row[key] = value.toJSON();
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
exports.transformRow = transformRow;
|
|
6
16
|
/**
|
|
7
17
|
* MS-SQL query stream class.
|
|
8
18
|
*/
|
|
@@ -19,7 +29,7 @@ class QueryStream extends stream_1.Readable {
|
|
|
19
29
|
});
|
|
20
30
|
this.request = request;
|
|
21
31
|
this.request.on('row', row => {
|
|
22
|
-
|
|
32
|
+
transformRow(row);
|
|
23
33
|
const canAdd = this.push(row);
|
|
24
34
|
if (this.toRead-- <= 0 || !canAdd) {
|
|
25
35
|
this.request?.pause();
|
|
@@ -39,13 +49,6 @@ class QueryStream extends stream_1.Readable {
|
|
|
39
49
|
this.toRead += toRead;
|
|
40
50
|
this.request?.resume();
|
|
41
51
|
}
|
|
42
|
-
transformRow(row) {
|
|
43
|
-
for (const [key, value] of Object.entries(row)) {
|
|
44
|
-
if (value instanceof Date) {
|
|
45
|
-
row[key] = value.toJSON();
|
|
46
|
-
}
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
52
|
/**
|
|
50
53
|
* @override
|
|
51
54
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryStream.js","sourceRoot":"","sources":["../../src/QueryStream.ts"],"names":[],"mappings":";;;AAAA,mCAAkC;AAElC,mDAEgC;AAEhC;;GAEG;AACH,MAAa,WAAY,SAAQ,iBAAQ;IAC/B,OAAO,CAAqB;IAE5B,MAAM,GAAW,CAAC,CAAC;IAE3B;;OAEG;IACH,YAAmB,OAAoB,EAAE,aAAqB;QAC5D,KAAK,CAAC;YACJ,UAAU,EAAE,IAAI;YAChB,aAAa,EACX,aAAa,IAAI,IAAA,eAAM,EAAC,4BAA4B,CAAC;SACxD,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE;YAC3B,
|
|
1
|
+
{"version":3,"file":"QueryStream.js","sourceRoot":"","sources":["../../src/QueryStream.ts"],"names":[],"mappings":";;;AAAA,mCAAkC;AAElC,mDAEgC;AAEhC,SAAgB,YAAY,CAAC,GAAwB;IACnD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAC9C,IAAI,KAAK,YAAY,IAAI,EAAE;YACzB,4EAA4E;YAC5E,4EAA4E;YAC5E,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;SAC3B;KACF;AACH,CAAC;AARD,oCAQC;AAED;;GAEG;AACH,MAAa,WAAY,SAAQ,iBAAQ;IAC/B,OAAO,CAAqB;IAE5B,MAAM,GAAW,CAAC,CAAC;IAE3B;;OAEG;IACH,YAAmB,OAAoB,EAAE,aAAqB;QAC5D,KAAK,CAAC;YACJ,UAAU,EAAE,IAAI;YAChB,aAAa,EACX,aAAa,IAAI,IAAA,eAAM,EAAC,4BAA4B,CAAC;SACxD,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE;YAC3B,YAAY,CAAC,GAAG,CAAC,CAAC;YAClB,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC9B,IAAI,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;gBACjC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC;aACvB;QACH,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;YAC3B,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAU,EAAE,EAAE;YACtC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACpB,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,MAAc;QACzB,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC;QACtB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IACzB,CAAC;IAED;;OAEG;IACI,QAAQ,CAAC,KAAU,EAAE,QAA0B;QACpD,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,QAAQ,CAAC,KAAK,CAAC,CAAC;IAClB,CAAC;CACF;AA9CD,kCA8CC"}
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@cubejs-backend/mssql-driver",
|
|
3
3
|
"description": "Cube.js MS SQL database driver",
|
|
4
4
|
"author": "Cube Dev, Inc.",
|
|
5
|
-
"version": "1.6.
|
|
5
|
+
"version": "1.6.15",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
8
8
|
"url": "https://github.com/cube-js/cube.git",
|
|
@@ -25,8 +25,8 @@
|
|
|
25
25
|
"lint:fix": "eslint --fix src/* --ext .ts,.js"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@cubejs-backend/base-driver": "1.6.
|
|
29
|
-
"@cubejs-backend/shared": "1.6.
|
|
28
|
+
"@cubejs-backend/base-driver": "1.6.15",
|
|
29
|
+
"@cubejs-backend/shared": "1.6.15",
|
|
30
30
|
"mssql": "^11.0.1"
|
|
31
31
|
},
|
|
32
32
|
"devDependencies": {
|
|
@@ -43,5 +43,5 @@
|
|
|
43
43
|
"publishConfig": {
|
|
44
44
|
"access": "public"
|
|
45
45
|
},
|
|
46
|
-
"gitHead": "
|
|
46
|
+
"gitHead": "2d0796b31177bb31ceaffe340c192307199639c5"
|
|
47
47
|
}
|