@proteinjs/db-driver-knex 1.14.1 → 1.15.1
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 +24 -0
- package/README.md +5 -3
- package/dist/generated/index.js +1 -1
- package/dist/generated/index.js.map +1 -1
- package/dist/generated/test/index.js +1 -1
- package/dist/generated/test/index.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/src/KnexConfig.d.ts +8 -0
- package/dist/src/KnexConfig.d.ts.map +1 -1
- package/dist/src/KnexDriver.d.ts +8 -7
- package/dist/src/KnexDriver.d.ts.map +1 -1
- package/dist/src/KnexDriver.js +52 -36
- package/dist/src/KnexDriver.js.map +1 -1
- package/dist/src/KnexFailureLine.d.ts +58 -0
- package/dist/src/KnexFailureLine.d.ts.map +1 -0
- package/dist/src/KnexFailureLine.js +124 -0
- package/dist/src/KnexFailureLine.js.map +1 -0
- package/dist/test/LogValuesSwitch.test.js +13 -7
- package/dist/test/LogValuesSwitch.test.js.map +1 -1
- package/dist/test/OperationDeadline.test.d.ts +2 -0
- package/dist/test/OperationDeadline.test.d.ts.map +1 -0
- package/dist/test/OperationDeadline.test.js +166 -0
- package/dist/test/OperationDeadline.test.js.map +1 -0
- package/dist/test/StatementLogNeverThrows.test.js +23 -29
- package/dist/test/StatementLogNeverThrows.test.js.map +1 -1
- package/dist/test/StatementParamLogging.test.js +16 -41
- package/dist/test/StatementParamLogging.test.js.map +1 -1
- package/dist/test/VendorTextNeverOnALine.test.d.ts +2 -0
- package/dist/test/VendorTextNeverOnALine.test.d.ts.map +1 -0
- package/dist/test/VendorTextNeverOnALine.test.js +330 -0
- package/dist/test/VendorTextNeverOnALine.test.js.map +1 -0
- package/generated/index.ts +1 -1
- package/generated/test/index.ts +1 -1
- package/index.ts +1 -0
- package/package.json +5 -5
- package/src/KnexConfig.ts +8 -0
- package/src/KnexDriver.ts +36 -37
- package/src/KnexFailureLine.ts +127 -0
- package/test/LogValuesSwitch.test.ts +3 -1
- package/test/OperationDeadline.test.ts +118 -0
- package/test/StatementLogNeverThrows.test.ts +24 -20
- package/test/StatementParamLogging.test.ts +12 -17
- package/test/VendorTextNeverOnALine.test.ts +257 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KnexDriver.js","sourceRoot":"","sources":["../../src/KnexDriver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAyC;AACzC,oCAQuB;AAEvB,iDAAgD;AAChD,4CAA2C;AAE3C,+DAA8D;AAC9D,iEAAgE;
|
|
1
|
+
{"version":3,"file":"KnexDriver.js","sourceRoot":"","sources":["../../src/KnexDriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* A failure as the driver's own line carries it under `cause`: the error's name, the vendor's
|
|
3
|
+
* codes and, as `message`, the driver's sentence — the field a reader of any driver's line parses.
|
|
4
|
+
*/
|
|
5
|
+
export type FailureCause = {
|
|
6
|
+
name?: string;
|
|
7
|
+
code?: string;
|
|
8
|
+
errno?: number;
|
|
9
|
+
sqlState?: string;
|
|
10
|
+
message: string;
|
|
11
|
+
/** The server's own message — behind the dev-only values switch, never otherwise. */
|
|
12
|
+
sqlMessage?: string;
|
|
13
|
+
};
|
|
14
|
+
/**
|
|
15
|
+
* The ONE owner of how a failure of the database reads on a LOG LINE: the vendor's codes and a
|
|
16
|
+
* sentence of the driver's own — never the vendor's text.
|
|
17
|
+
*
|
|
18
|
+
* What the driver THROWS is the vendor's error itself, untouched, and it is not safe to print:
|
|
19
|
+
* the query layer rewrites its `message` to the SQL with every binding INTERPOLATED, the client
|
|
20
|
+
* library carries the same text as `sql`, and the server's own message (`sqlMessage`) quotes the
|
|
21
|
+
* value it refused (`Duplicate entry '<key>' for key 'PRIMARY'`). The driver's own line never
|
|
22
|
+
* carried the first two; a CALLER's line about the error it caught carried all three. So every
|
|
23
|
+
* failure that leaves the driver is marked with the logger (`mark`), which never touches the
|
|
24
|
+
* error; from then on any line about it, the driver's or a caller's, carries the codes and the
|
|
25
|
+
* sentence in place of the error's own text.
|
|
26
|
+
*
|
|
27
|
+
* The vendor's text rides a line only behind the dev-only values switch (KnexLogValues): with
|
|
28
|
+
* both gates open a marked error prints as it is, and `causeOf` adds the server's message.
|
|
29
|
+
* Asked at each line, like the switch itself.
|
|
30
|
+
*/
|
|
31
|
+
export declare class KnexFailureLine {
|
|
32
|
+
private static readonly UNNAMED;
|
|
33
|
+
private static readonly UNREACHABLE;
|
|
34
|
+
private static readonly SENTENCES;
|
|
35
|
+
/**
|
|
36
|
+
* The failures the query layer raises itself, which carry no vendor code — by the error's name.
|
|
37
|
+
* Its timeout is one error for the statement's operation deadline and for the wait for a free
|
|
38
|
+
* connection; either way it carries the statement's bindings, so it is marked like any other.
|
|
39
|
+
*/
|
|
40
|
+
private static readonly SENTENCES_BY_NAME;
|
|
41
|
+
/**
|
|
42
|
+
* Marks `error` — whatever the client library or the query layer rejected with — as never
|
|
43
|
+
* printing its own text, and answers the same error. `what` is the driver's words for what
|
|
44
|
+
* failed. An error already marked keeps its line.
|
|
45
|
+
*/
|
|
46
|
+
static mark<T>(error: T, what: string): T;
|
|
47
|
+
/**
|
|
48
|
+
* The failure as the driver's own line carries it under `cause` — never the query layer's
|
|
49
|
+
* rewritten `message` or `sql`, and the server's own message only behind the values switch.
|
|
50
|
+
* Total: a fact that cannot be read is left out.
|
|
51
|
+
*/
|
|
52
|
+
static causeOf(error: unknown): FailureCause;
|
|
53
|
+
private static lineOf;
|
|
54
|
+
private static sentenceOf;
|
|
55
|
+
/** One fact of a thrown value, or nothing when it cannot be read (nothing thrown, a scalar, a throwing accessor). */
|
|
56
|
+
private static vendorFact;
|
|
57
|
+
}
|
|
58
|
+
//# sourceMappingURL=KnexFailureLine.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"KnexFailureLine.d.ts","sourceRoot":"","sources":["../../src/KnexFailureLine.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,qFAAqF;IACrF,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAwC;IACvE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAuC;IAC1E,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAoB/B;IACF;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAEvC;IAEF;;;;OAIG;IACH,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC;IAOzC;;;;OAIG;IACH,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,YAAY;IAgB5C,OAAO,CAAC,MAAM,CAAC,MAAM;IAUrB,OAAO,CAAC,MAAM,CAAC,UAAU;IAQzB,qHAAqH;IACrH,OAAO,CAAC,MAAM,CAAC,UAAU;CAO1B"}
|
|
@@ -0,0 +1,124 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __assign = (this && this.__assign) || function () {
|
|
3
|
+
__assign = Object.assign || function(t) {
|
|
4
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
+
s = arguments[i];
|
|
6
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
+
t[p] = s[p];
|
|
8
|
+
}
|
|
9
|
+
return t;
|
|
10
|
+
};
|
|
11
|
+
return __assign.apply(this, arguments);
|
|
12
|
+
};
|
|
13
|
+
var __rest = (this && this.__rest) || function (s, e) {
|
|
14
|
+
var t = {};
|
|
15
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
16
|
+
t[p] = s[p];
|
|
17
|
+
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
18
|
+
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
19
|
+
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
20
|
+
t[p[i]] = s[p[i]];
|
|
21
|
+
}
|
|
22
|
+
return t;
|
|
23
|
+
};
|
|
24
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
25
|
+
exports.KnexFailureLine = void 0;
|
|
26
|
+
var logger_1 = require("@proteinjs/logger");
|
|
27
|
+
var KnexLogValues_1 = require("./KnexLogValues");
|
|
28
|
+
/**
|
|
29
|
+
* The ONE owner of how a failure of the database reads on a LOG LINE: the vendor's codes and a
|
|
30
|
+
* sentence of the driver's own — never the vendor's text.
|
|
31
|
+
*
|
|
32
|
+
* What the driver THROWS is the vendor's error itself, untouched, and it is not safe to print:
|
|
33
|
+
* the query layer rewrites its `message` to the SQL with every binding INTERPOLATED, the client
|
|
34
|
+
* library carries the same text as `sql`, and the server's own message (`sqlMessage`) quotes the
|
|
35
|
+
* value it refused (`Duplicate entry '<key>' for key 'PRIMARY'`). The driver's own line never
|
|
36
|
+
* carried the first two; a CALLER's line about the error it caught carried all three. So every
|
|
37
|
+
* failure that leaves the driver is marked with the logger (`mark`), which never touches the
|
|
38
|
+
* error; from then on any line about it, the driver's or a caller's, carries the codes and the
|
|
39
|
+
* sentence in place of the error's own text.
|
|
40
|
+
*
|
|
41
|
+
* The vendor's text rides a line only behind the dev-only values switch (KnexLogValues): with
|
|
42
|
+
* both gates open a marked error prints as it is, and `causeOf` adds the server's message.
|
|
43
|
+
* Asked at each line, like the switch itself.
|
|
44
|
+
*/
|
|
45
|
+
var KnexFailureLine = /** @class */ (function () {
|
|
46
|
+
function KnexFailureLine() {
|
|
47
|
+
}
|
|
48
|
+
/**
|
|
49
|
+
* Marks `error` — whatever the client library or the query layer rejected with — as never
|
|
50
|
+
* printing its own text, and answers the same error. `what` is the driver's words for what
|
|
51
|
+
* failed. An error already marked keeps its line.
|
|
52
|
+
*/
|
|
53
|
+
KnexFailureLine.mark = function (error, what) {
|
|
54
|
+
if (!logger_1.LogLineErrors.isMarked(error)) {
|
|
55
|
+
logger_1.LogLineErrors.mark(error, function () { return (KnexLogValues_1.KnexLogValues.enabled() ? undefined : KnexFailureLine.lineOf(error, what)); });
|
|
56
|
+
}
|
|
57
|
+
return error;
|
|
58
|
+
};
|
|
59
|
+
/**
|
|
60
|
+
* The failure as the driver's own line carries it under `cause` — never the query layer's
|
|
61
|
+
* rewritten `message` or `sql`, and the server's own message only behind the values switch.
|
|
62
|
+
* Total: a fact that cannot be read is left out.
|
|
63
|
+
*/
|
|
64
|
+
KnexFailureLine.causeOf = function (error) {
|
|
65
|
+
var name = KnexFailureLine.vendorFact(error, 'name');
|
|
66
|
+
var code = KnexFailureLine.vendorFact(error, 'code');
|
|
67
|
+
var errno = KnexFailureLine.vendorFact(error, 'errno');
|
|
68
|
+
var sqlState = KnexFailureLine.vendorFact(error, 'sqlState');
|
|
69
|
+
var sqlMessage = KnexLogValues_1.KnexLogValues.enabled() ? KnexFailureLine.vendorFact(error, 'sqlMessage') : undefined;
|
|
70
|
+
return __assign(__assign(__assign(__assign(__assign(__assign({}, (typeof name === 'string' ? { name: name } : {})), (typeof code === 'string' ? { code: code } : {})), (typeof errno === 'number' ? { errno: errno } : {})), (typeof sqlState === 'string' ? { sqlState: sqlState } : {})), { message: KnexFailureLine.sentenceOf(code, name) }), (typeof sqlMessage === 'string' ? { sqlMessage: sqlMessage } : {}));
|
|
71
|
+
};
|
|
72
|
+
KnexFailureLine.lineOf = function (error, what) {
|
|
73
|
+
var _a = KnexFailureLine.causeOf(error), _name = _a.name, message = _a.message, _sqlMessage = _a.sqlMessage, codes = __rest(_a, ["name", "message", "sqlMessage"]);
|
|
74
|
+
var named = [codes.code, codes.errno !== undefined ? "errno ".concat(codes.errno) : undefined].filter(Boolean);
|
|
75
|
+
return __assign(__assign({}, (codes.code !== undefined ? { code: codes.code } : {})), { sentence: "".concat(what).concat(named.length ? " (".concat(named.join(', '), ")") : '', ": ").concat(message), facts: codes });
|
|
76
|
+
};
|
|
77
|
+
KnexFailureLine.sentenceOf = function (code, name) {
|
|
78
|
+
var _a, _b;
|
|
79
|
+
return ((_b = (_a = (typeof code === 'string' ? KnexFailureLine.SENTENCES[code] : undefined)) !== null && _a !== void 0 ? _a : (typeof name === 'string' ? KnexFailureLine.SENTENCES_BY_NAME[name] : undefined)) !== null && _b !== void 0 ? _b : KnexFailureLine.UNNAMED);
|
|
80
|
+
};
|
|
81
|
+
/** One fact of a thrown value, or nothing when it cannot be read (nothing thrown, a scalar, a throwing accessor). */
|
|
82
|
+
KnexFailureLine.vendorFact = function (error, fact) {
|
|
83
|
+
try {
|
|
84
|
+
return error === null || error === void 0 ? void 0 : error[fact];
|
|
85
|
+
}
|
|
86
|
+
catch (_a) {
|
|
87
|
+
return undefined;
|
|
88
|
+
}
|
|
89
|
+
};
|
|
90
|
+
KnexFailureLine.UNNAMED = 'the database refused the statement';
|
|
91
|
+
KnexFailureLine.UNREACHABLE = 'the database could not be reached';
|
|
92
|
+
KnexFailureLine.SENTENCES = {
|
|
93
|
+
ER_DUP_ENTRY: 'a row with that key already exists',
|
|
94
|
+
ER_NO_SUCH_TABLE: 'a table the statement names does not exist',
|
|
95
|
+
ER_BAD_FIELD_ERROR: 'a column the statement names does not exist',
|
|
96
|
+
ER_PARSE_ERROR: 'the statement does not parse',
|
|
97
|
+
ER_LOCK_DEADLOCK: 'the transaction was chosen as a deadlock victim',
|
|
98
|
+
ER_LOCK_WAIT_TIMEOUT: 'a lock wait timed out',
|
|
99
|
+
ER_DATA_TOO_LONG: 'a value is longer than its column',
|
|
100
|
+
ER_TRUNCATED_WRONG_VALUE: 'a value does not convert to the type of its column',
|
|
101
|
+
ER_TRUNCATED_WRONG_VALUE_FOR_FIELD: 'a value does not convert to the type of its column',
|
|
102
|
+
ER_WARN_DATA_OUT_OF_RANGE: 'a value is out of range for its column',
|
|
103
|
+
ER_BAD_NULL_ERROR: 'a column that cannot be null was given null',
|
|
104
|
+
ER_NO_REFERENCED_ROW_2: 'a foreign key refused the statement',
|
|
105
|
+
ER_ROW_IS_REFERENCED_2: 'a foreign key refused the statement',
|
|
106
|
+
ER_ACCESS_DENIED_ERROR: 'the credentials of the caller were not accepted',
|
|
107
|
+
ER_NET_PACKET_TOO_LARGE: 'the statement is larger than the server accepts',
|
|
108
|
+
ECONNREFUSED: KnexFailureLine.UNREACHABLE,
|
|
109
|
+
ECONNRESET: KnexFailureLine.UNREACHABLE,
|
|
110
|
+
ETIMEDOUT: KnexFailureLine.UNREACHABLE,
|
|
111
|
+
PROTOCOL_CONNECTION_LOST: KnexFailureLine.UNREACHABLE,
|
|
112
|
+
};
|
|
113
|
+
/**
|
|
114
|
+
* The failures the query layer raises itself, which carry no vendor code — by the error's name.
|
|
115
|
+
* Its timeout is one error for the statement's operation deadline and for the wait for a free
|
|
116
|
+
* connection; either way it carries the statement's bindings, so it is marked like any other.
|
|
117
|
+
*/
|
|
118
|
+
KnexFailureLine.SENTENCES_BY_NAME = {
|
|
119
|
+
KnexTimeoutError: 'the statement or its wait for a connection timed out',
|
|
120
|
+
};
|
|
121
|
+
return KnexFailureLine;
|
|
122
|
+
}());
|
|
123
|
+
exports.KnexFailureLine = KnexFailureLine;
|
|
124
|
+
//# sourceMappingURL=KnexFailureLine.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"KnexFailureLine.js","sourceRoot":"","sources":["../../src/KnexFailureLine.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __assign = (this && this.__assign) || function () {
|
|
3
|
+
__assign = Object.assign || function(t) {
|
|
4
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
+
s = arguments[i];
|
|
6
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
+
t[p] = s[p];
|
|
8
|
+
}
|
|
9
|
+
return t;
|
|
10
|
+
};
|
|
11
|
+
return __assign.apply(this, arguments);
|
|
12
|
+
};
|
|
2
13
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
14
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
15
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -182,13 +193,8 @@ describe('the dev-only values switch: real values ride the driver`s failure line
|
|
|
182
193
|
expect(facts(caught)).toEqual(baseline);
|
|
183
194
|
// The description and the summary ride the line at every gate.
|
|
184
195
|
expect(failure.obj.params).toEqual([{ type: 'string', length: VALUE.length }, { type: 'number' }]);
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
code: 'ER_NO_SUCH_TABLE',
|
|
188
|
-
errno: 1146,
|
|
189
|
-
sqlState: '42S02',
|
|
190
|
-
sqlMessage: "Table 'test.credential' doesn't exist",
|
|
191
|
-
});
|
|
196
|
+
// The server's own message rides the summary only behind the switch.
|
|
197
|
+
expect(failure.obj.cause).toEqual(__assign({ name: 'Error', code: 'ER_NO_SUCH_TABLE', errno: 1146, sqlState: '42S02', message: 'a table the statement names does not exist' }, (on ? { sqlMessage: "Table 'test.credential' doesn't exist" } : {})));
|
|
192
198
|
if (!on) {
|
|
193
199
|
for (_i = 0, captured_1 = captured; _i < captured_1.length; _i++) {
|
|
194
200
|
log = captured_1[_i];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LogValuesSwitch.test.js","sourceRoot":"","sources":["../../test/LogValuesSwitch.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"LogValuesSwitch.test.js","sourceRoot":"","sources":["../../test/LogValuesSwitch.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"OperationDeadline.test.d.ts","sourceRoot":"","sources":["../../test/OperationDeadline.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,166 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __assign = (this && this.__assign) || function () {
|
|
3
|
+
__assign = Object.assign || function(t) {
|
|
4
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
+
s = arguments[i];
|
|
6
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
+
t[p] = s[p];
|
|
8
|
+
}
|
|
9
|
+
return t;
|
|
10
|
+
};
|
|
11
|
+
return __assign.apply(this, arguments);
|
|
12
|
+
};
|
|
13
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
14
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
15
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
16
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
17
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
18
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
19
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
20
|
+
});
|
|
21
|
+
};
|
|
22
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
23
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
24
|
+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
25
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
26
|
+
function step(op) {
|
|
27
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
28
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
29
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
30
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
31
|
+
switch (op[0]) {
|
|
32
|
+
case 0: case 1: t = op; break;
|
|
33
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
34
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
35
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
36
|
+
default:
|
|
37
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
38
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
39
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
40
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
41
|
+
if (t[2]) _.ops.pop();
|
|
42
|
+
_.trys.pop(); continue;
|
|
43
|
+
}
|
|
44
|
+
op = body.call(thisArg, _);
|
|
45
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
46
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
47
|
+
}
|
|
48
|
+
};
|
|
49
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
50
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
51
|
+
};
|
|
52
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
53
|
+
var knex_1 = __importDefault(require("knex"));
|
|
54
|
+
var db_driver_knex_1 = require("@proteinjs/db-driver-knex");
|
|
55
|
+
var logger_1 = require("@proteinjs/logger");
|
|
56
|
+
/** The thread ids of the connections a statement was left unanswered on. */
|
|
57
|
+
var unanswered = [];
|
|
58
|
+
/** Every `KILL QUERY` the stub server received, by the thread id it named. */
|
|
59
|
+
var killed = [];
|
|
60
|
+
var nextThreadId = 100;
|
|
61
|
+
/** A connection whose server never answers a statement — until it is killed. */
|
|
62
|
+
var silentConnection = function () {
|
|
63
|
+
var threadId = nextThreadId++;
|
|
64
|
+
return {
|
|
65
|
+
threadId: threadId,
|
|
66
|
+
state: 'authenticated',
|
|
67
|
+
on: function () { return undefined; },
|
|
68
|
+
removeAllListeners: function () { return undefined; },
|
|
69
|
+
connect: function (done) { return done(); },
|
|
70
|
+
end: function (done) { return done(); },
|
|
71
|
+
query: function (options, bindings, done) {
|
|
72
|
+
if (/^\s*(BEGIN|COMMIT|ROLLBACK)/i.test(options.sql)) {
|
|
73
|
+
done(null, []);
|
|
74
|
+
return;
|
|
75
|
+
}
|
|
76
|
+
if (/^\s*KILL QUERY/i.test(options.sql)) {
|
|
77
|
+
killed.push(bindings[0]);
|
|
78
|
+
done(null, []);
|
|
79
|
+
return;
|
|
80
|
+
}
|
|
81
|
+
// Never answered: the statement a dead link or a stuck server leaves in flight.
|
|
82
|
+
unanswered.push(threadId);
|
|
83
|
+
},
|
|
84
|
+
};
|
|
85
|
+
};
|
|
86
|
+
var config = { host: 'localhost', user: 'root', password: '', dbName: 'test' };
|
|
87
|
+
var statement = function () { return ({ sql: 'SELECT `id` FROM `row` WHERE `id` = ?', params: ['row-1'] }); };
|
|
88
|
+
describe('The knex driver`s per-operation deadline: reported, and enforced on every statement', function () {
|
|
89
|
+
var statics = db_driver_knex_1.KnexDriver;
|
|
90
|
+
var instance;
|
|
91
|
+
var previousInstance;
|
|
92
|
+
beforeAll(function () {
|
|
93
|
+
instance = (0, knex_1.default)({ client: 'mysql', connection: { host: 'localhost', user: 'root', password: '' } });
|
|
94
|
+
// The dialect's own connection lifecycle, over a stub client library.
|
|
95
|
+
instance.client.driver = { createConnection: silentConnection };
|
|
96
|
+
previousInstance = statics.KNEX;
|
|
97
|
+
statics.KNEX = instance;
|
|
98
|
+
});
|
|
99
|
+
afterAll(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
100
|
+
return __generator(this, function (_a) {
|
|
101
|
+
switch (_a.label) {
|
|
102
|
+
case 0:
|
|
103
|
+
statics.KNEX = previousInstance;
|
|
104
|
+
return [4 /*yield*/, instance.destroy()];
|
|
105
|
+
case 1:
|
|
106
|
+
_a.sent();
|
|
107
|
+
return [2 /*return*/];
|
|
108
|
+
}
|
|
109
|
+
});
|
|
110
|
+
}); });
|
|
111
|
+
beforeEach(function () {
|
|
112
|
+
unanswered.length = 0;
|
|
113
|
+
killed.length = 0;
|
|
114
|
+
});
|
|
115
|
+
/** A driver with `deadlineMs`, its failure lines kept off the test output. */
|
|
116
|
+
var driverWith = function (deadlineMs) {
|
|
117
|
+
var driver = new db_driver_knex_1.KnexDriver(__assign(__assign({}, config), { operationDeadlineMs: deadlineMs }));
|
|
118
|
+
driver.logger = new logger_1.Logger({
|
|
119
|
+
name: 'KnexDriver',
|
|
120
|
+
logWriter: { write: function () { return undefined; } },
|
|
121
|
+
});
|
|
122
|
+
return driver;
|
|
123
|
+
};
|
|
124
|
+
test('the driver reports the deadline it is configured with, and 60 s when none is configured', function () {
|
|
125
|
+
expect(driverWith(500).getOperationDeadlineMs()).toBe(500);
|
|
126
|
+
expect(new db_driver_knex_1.KnexDriver(config).getOperationDeadlineMs()).toBe(60000);
|
|
127
|
+
});
|
|
128
|
+
test('a statement the server never answers fails AT the deadline, naming it, and is cancelled on the server', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
129
|
+
var driver, before, elapsed;
|
|
130
|
+
return __generator(this, function (_a) {
|
|
131
|
+
switch (_a.label) {
|
|
132
|
+
case 0:
|
|
133
|
+
driver = driverWith(500);
|
|
134
|
+
before = Date.now();
|
|
135
|
+
return [4 /*yield*/, expect(driver.runQuery(statement)).rejects.toThrow(/Defined query timeout of 500ms exceeded/)];
|
|
136
|
+
case 1:
|
|
137
|
+
_a.sent();
|
|
138
|
+
elapsed = Date.now() - before;
|
|
139
|
+
expect(elapsed).toBeGreaterThanOrEqual(450);
|
|
140
|
+
expect(elapsed).toBeLessThan(3000);
|
|
141
|
+
// The cancel named the connection the statement was left on.
|
|
142
|
+
expect(unanswered).toHaveLength(1);
|
|
143
|
+
expect(killed).toEqual(unanswered);
|
|
144
|
+
return [2 /*return*/];
|
|
145
|
+
}
|
|
146
|
+
});
|
|
147
|
+
}); }, 10000);
|
|
148
|
+
test('a statement inside a transaction runs under the same deadline, and the transaction fails with it', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
149
|
+
var driver, before;
|
|
150
|
+
return __generator(this, function (_a) {
|
|
151
|
+
switch (_a.label) {
|
|
152
|
+
case 0:
|
|
153
|
+
driver = driverWith(500);
|
|
154
|
+
before = Date.now();
|
|
155
|
+
return [4 /*yield*/, expect(driver.runTransaction(function (transaction) { return driver.runDml(statement, transaction); })).rejects.toThrow(/Defined query timeout of 500ms exceeded/)];
|
|
156
|
+
case 1:
|
|
157
|
+
_a.sent();
|
|
158
|
+
expect(Date.now() - before).toBeLessThan(3000);
|
|
159
|
+
expect(unanswered).toHaveLength(1);
|
|
160
|
+
expect(killed).toEqual(unanswered);
|
|
161
|
+
return [2 /*return*/];
|
|
162
|
+
}
|
|
163
|
+
});
|
|
164
|
+
}); }, 10000);
|
|
165
|
+
});
|
|
166
|
+
//# sourceMappingURL=OperationDeadline.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"OperationDeadline.test.js","sourceRoot":"","sources":["../../test/OperationDeadline.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __assign = (this && this.__assign) || function () {
|
|
3
|
-
__assign = Object.assign || function(t) {
|
|
4
|
-
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
-
s = arguments[i];
|
|
6
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
-
t[p] = s[p];
|
|
8
|
-
}
|
|
9
|
-
return t;
|
|
10
|
-
};
|
|
11
|
-
return __assign.apply(this, arguments);
|
|
12
|
-
};
|
|
13
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
14
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
15
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -63,7 +52,7 @@ var printedLine_1 = require("./util/printedLine");
|
|
|
63
52
|
*
|
|
64
53
|
* Two layers hold that, and this suite holds both:
|
|
65
54
|
*
|
|
66
|
-
* - the helpers that build the line (`describeParams`, `
|
|
55
|
+
* - the helpers that build the line (`describeParams`, `KnexFailureLine.causeOf`) are TOTAL: whatever they
|
|
67
56
|
* are handed — positional bindings, a bindings dictionary, nothing, null, a scalar, a Map, a
|
|
68
57
|
* value whose accessor or `toJSON` throws, a proxy that refuses everything — they return a
|
|
69
58
|
* description and never a value;
|
|
@@ -204,13 +193,8 @@ describe('describeParams is total: any bindings, a description, never a value',
|
|
|
204
193
|
expect((_a = JSON.stringify(described)) !== null && _a !== void 0 ? _a : '').not.toContain(CANARY);
|
|
205
194
|
});
|
|
206
195
|
});
|
|
207
|
-
describe('
|
|
208
|
-
var
|
|
209
|
-
host: 'localhost',
|
|
210
|
-
user: 'root',
|
|
211
|
-
password: '',
|
|
212
|
-
dbName: 'test',
|
|
213
|
-
});
|
|
196
|
+
describe('KnexFailureLine.causeOf is total: anything thrown, a summary of codes and the driver`s sentence, never the vendor`s text', function () {
|
|
197
|
+
var UNNAMED = 'the database refused the statement';
|
|
214
198
|
var vendorFacts = {
|
|
215
199
|
code: 'ER_NO_SUCH_TABLE',
|
|
216
200
|
errno: 1146,
|
|
@@ -221,25 +205,35 @@ describe('causeSummary is total: anything thrown, a summary of codes, never the
|
|
|
221
205
|
[
|
|
222
206
|
'a vendor error whose message and sql carry the bindings',
|
|
223
207
|
function () { return Object.assign(new Error("insert ... '".concat(CANARY, "'")), vendorFacts, { sql: "insert ... '".concat(CANARY, "'") }); },
|
|
224
|
-
|
|
208
|
+
{
|
|
209
|
+
name: 'Error',
|
|
210
|
+
code: 'ER_NO_SUCH_TABLE',
|
|
211
|
+
errno: 1146,
|
|
212
|
+
sqlState: '42S02',
|
|
213
|
+
message: 'a table the statement names does not exist',
|
|
214
|
+
},
|
|
215
|
+
],
|
|
216
|
+
['nothing', function () { return undefined; }, { message: UNNAMED }],
|
|
217
|
+
['null', function () { return null; }, { message: UNNAMED }],
|
|
218
|
+
['a thrown string', function () { return CANARY; }, { message: UNNAMED }],
|
|
219
|
+
['a thrown number', function () { return 1146; }, { message: UNNAMED }],
|
|
220
|
+
[
|
|
221
|
+
'facts of the wrong kind',
|
|
222
|
+
function () { return ({ name: 5, code: 1146, errno: '1146', sqlState: null, sqlMessage: {} }); },
|
|
223
|
+
{ message: UNNAMED },
|
|
225
224
|
],
|
|
226
|
-
['nothing', function () { return undefined; }, {}],
|
|
227
|
-
['null', function () { return null; }, {}],
|
|
228
|
-
['a thrown string', function () { return CANARY; }, {}],
|
|
229
|
-
['a thrown number', function () { return 1146; }, {}],
|
|
230
|
-
['facts of the wrong kind', function () { return ({ name: 5, code: 1146, errno: '1146', sqlState: null, sqlMessage: {} }); }, {}],
|
|
231
225
|
[
|
|
232
226
|
'an error with a fact whose accessor throws',
|
|
233
227
|
function () { return throwingEntry(Object.assign(new Error(CANARY), vendorFacts), 'code'); },
|
|
234
|
-
{ name: 'Error', errno: 1146, sqlState: '42S02',
|
|
228
|
+
{ name: 'Error', errno: 1146, sqlState: '42S02', message: UNNAMED },
|
|
235
229
|
],
|
|
236
|
-
['an error that refuses every read', function () { return refusesEverything(new Error(CANARY)); }, {}],
|
|
237
|
-
['a revoked error', function () { return revoked(new Error(CANARY)); }, {}],
|
|
230
|
+
['an error that refuses every read', function () { return refusesEverything(new Error(CANARY)); }, { message: UNNAMED }],
|
|
231
|
+
['a revoked error', function () { return revoked(new Error(CANARY)); }, { message: UNNAMED }],
|
|
238
232
|
];
|
|
239
233
|
test.each(THROWN)('%s', function (_shape, thrown, expected) {
|
|
240
234
|
var summary;
|
|
241
235
|
expect(function () {
|
|
242
|
-
summary =
|
|
236
|
+
summary = db_driver_knex_1.KnexFailureLine.causeOf(thrown());
|
|
243
237
|
}).not.toThrow();
|
|
244
238
|
expect(summary).toEqual(expected);
|
|
245
239
|
expect((0, util_1.inspect)(summary, { depth: 10, showHidden: true })).not.toContain(CANARY);
|