@proteinjs/db-driver-knex 1.1.16 → 1.1.17
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 +11 -0
- package/dist/generated/index.d.ts +1 -0
- package/dist/generated/index.d.ts.map +1 -1
- package/dist/generated/index.js +1 -0
- package/dist/generated/index.js.map +1 -1
- package/dist/src/KnexDriver.d.ts.map +1 -1
- package/dist/src/KnexDriver.js +4 -4
- package/dist/src/KnexDriver.js.map +1 -1
- package/dist/src/KnexSchemaOperations.d.ts.map +1 -1
- package/dist/src/KnexSchemaOperations.js +21 -15
- package/dist/src/KnexSchemaOperations.js.map +1 -1
- package/generated/index.ts +1 -0
- package/package.json +5 -4
- package/src/KnexDriver.ts +4 -4
- package/src/KnexSchemaOperations.ts +21 -15
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,17 @@
|
|
|
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
|
+
## [1.1.17](https://github.com/proteinjs/db/compare/@proteinjs/db-driver-knex@1.1.16...@proteinjs/db-driver-knex@1.1.17) (2024-08-16)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* refactored to implement new @proteinjs/logger/Logger api ([66578f2](https://github.com/proteinjs/db/commit/66578f267d9293c0d5703c63e53d8edf68325f52))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
6
17
|
## [1.1.16](https://github.com/proteinjs/db/compare/@proteinjs/db-driver-knex@1.1.15...@proteinjs/db-driver-knex@1.1.16) (2024-08-11)
|
|
7
18
|
|
|
8
19
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../generated/index.ts"],"names":[],"mappings":"AAAA,oCAAoC;AAEpC,OAAO,eAAe,CAAC;AACvB,OAAO,qBAAqB,CAAC;AAC7B,OAAO,uBAAuB,CAAC;AAC/B,OAAO,iBAAiB,CAAC;AACzB,OAAO,MAAM,CAAC;AACd,OAAO,QAAQ,CAAC;AAChB,OAAO,OAAO,CAAC;AACf,OAAO,MAAM,CAAC;AAyBd,cAAc,UAAU,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../generated/index.ts"],"names":[],"mappings":"AAAA,oCAAoC;AAEpC,OAAO,eAAe,CAAC;AACvB,OAAO,qBAAqB,CAAC;AAC7B,OAAO,mBAAmB,CAAC;AAC3B,OAAO,uBAAuB,CAAC;AAC/B,OAAO,iBAAiB,CAAC;AACzB,OAAO,MAAM,CAAC;AACd,OAAO,QAAQ,CAAC;AAChB,OAAO,OAAO,CAAC;AACf,OAAO,MAAM,CAAC;AAyBd,cAAc,UAAU,CAAC"}
|
package/dist/generated/index.js
CHANGED
|
@@ -17,6 +17,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
18
|
require("@proteinjs/db");
|
|
19
19
|
require("@proteinjs/db-query");
|
|
20
|
+
require("@proteinjs/logger");
|
|
20
21
|
require("@proteinjs/reflection");
|
|
21
22
|
require("@proteinjs/util");
|
|
22
23
|
require("knex");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../generated/index.ts"],"names":[],"mappings":";AAAA,oCAAoC;;;;;;;;;;;;;;;;AAEpC,yBAAuB;AACvB,+BAA6B;AAC7B,iCAA+B;AAC/B,2BAAyB;AACzB,gBAAc;AACd,kBAAgB;AAChB,iBAAe;AACf,gBAAc;AAGd,4BAA4B;AAE5B,IAAM,WAAW,GAAG,y8SAAy8S,CAAC;AAG99S,4BAA4B;AAE5B,gDAA+C;AAC/C,oEAAmE;AAEnE,IAAM,WAAW,GAAG;IACnB,sCAAsC,EAAE,uBAAU;IAClD,gDAAgD,EAAE,2CAAoB;CACtE,CAAC;AAGF,kCAAkC;AAElC,oDAAyD;AACzD,6BAAgB,CAAC,KAAK,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;AAGjD,2CAAyB"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../generated/index.ts"],"names":[],"mappings":";AAAA,oCAAoC;;;;;;;;;;;;;;;;AAEpC,yBAAuB;AACvB,+BAA6B;AAC7B,6BAA2B;AAC3B,iCAA+B;AAC/B,2BAAyB;AACzB,gBAAc;AACd,kBAAgB;AAChB,iBAAe;AACf,gBAAc;AAGd,4BAA4B;AAE5B,IAAM,WAAW,GAAG,y8SAAy8S,CAAC;AAG99S,4BAA4B;AAE5B,gDAA+C;AAC/C,oEAAmE;AAEnE,IAAM,WAAW,GAAG;IACnB,sCAAsC,EAAE,uBAAU;IAClD,gDAAgD,EAAE,2CAAoB;CACtE,CAAC;AAGF,kCAAkC;AAElC,oDAAyD;AACzD,6BAAgB,CAAC,KAAK,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;AAGjD,2CAAyB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KnexDriver.d.ts","sourceRoot":"","sources":["../../src/KnexDriver.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EACL,QAAQ,EACR,4BAA4B,EAC5B,0BAA0B,EAC1B,gBAAgB,EAChB,KAAK,EACL,YAAY,EAEb,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAIhD,qBAAa,UAAW,YAAW,QAAQ;IACzC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAO;IAC1B,OAAO,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"KnexDriver.d.ts","sourceRoot":"","sources":["../../src/KnexDriver.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EACL,QAAQ,EACR,4BAA4B,EAC5B,0BAA0B,EAC1B,gBAAgB,EAChB,KAAK,EACL,YAAY,EAEb,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAIhD,qBAAa,UAAW,YAAW,QAAQ;IACzC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAO;IAC1B,OAAO,CAAC,MAAM,CAA+C;IAC7D,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,UAAU,CAAM;IACjB,QAAQ,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC;gBAEhD,MAAM,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,KAAK,CAAC,GAAG,CAAC;IAavE,OAAO,IAAI,IAAI;IAQf,SAAS;IAIH,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;YAQ5B,QAAQ;IAWhB,KAAK;IAIL,IAAI;YAII,uBAAuB;IAOrC,eAAe,IAAI,YAAY;IAM/B;;;;OAIG;IACH,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,GAAG,MAAM;IAsBtF,QAAQ,CAAC,iBAAiB,EAAE,CAAC,MAAM,EAAE,4BAA4B,KAAK,SAAS,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAc7G,MAAM,CAAC,iBAAiB,EAAE,CAAC,MAAM,EAAE,0BAA0B,KAAK,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;CAIpG"}
|
package/dist/src/KnexDriver.js
CHANGED
|
@@ -42,12 +42,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
42
42
|
exports.KnexDriver = void 0;
|
|
43
43
|
var knex_1 = __importDefault(require("knex"));
|
|
44
44
|
var db_1 = require("@proteinjs/db");
|
|
45
|
-
var
|
|
45
|
+
var logger_1 = require("@proteinjs/logger");
|
|
46
46
|
var KnexSchemaOperations_1 = require("./KnexSchemaOperations");
|
|
47
47
|
var KnexColumnTypeFactory_1 = require("./KnexColumnTypeFactory");
|
|
48
48
|
var KnexDriver = /** @class */ (function () {
|
|
49
49
|
function KnexDriver(config, getTable) {
|
|
50
|
-
this.logger = new
|
|
50
|
+
this.logger = new logger_1.Logger({ name: this.constructor.name });
|
|
51
51
|
this.config = config;
|
|
52
52
|
this.knexConfig = {
|
|
53
53
|
client: 'mysql',
|
|
@@ -139,7 +139,7 @@ var KnexDriver = /** @class */ (function () {
|
|
|
139
139
|
case 2:
|
|
140
140
|
_a.sent();
|
|
141
141
|
KnexDriver.KNEX = (0, knex_1.default)(this.knexConfig);
|
|
142
|
-
this.logger.info('Set global max_allowed_packet size to 1gb');
|
|
142
|
+
this.logger.info({ message: 'Set global max_allowed_packet size to 1gb' });
|
|
143
143
|
return [2 /*return*/];
|
|
144
144
|
}
|
|
145
145
|
});
|
|
@@ -189,7 +189,7 @@ var KnexDriver = /** @class */ (function () {
|
|
|
189
189
|
case 2: return [2 /*return*/, (_b.sent())[0]]; // returns 2 arrays, first is records, second is metadata per record
|
|
190
190
|
case 3:
|
|
191
191
|
error_1 = _b.sent();
|
|
192
|
-
this.logger.error("Failed when executing
|
|
192
|
+
this.logger.error({ message: "Failed when executing sql", obj: { sql: sql }, error: error_1 });
|
|
193
193
|
throw error_1;
|
|
194
194
|
case 4: return [2 /*return*/];
|
|
195
195
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KnexDriver.js","sourceRoot":"","sources":["../../src/KnexDriver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAwB;AACxB,oCAQuB;AAEvB,
|
|
1
|
+
{"version":3,"file":"KnexDriver.js","sourceRoot":"","sources":["../../src/KnexDriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KnexSchemaOperations.d.ts","sourceRoot":"","sources":["../../src/KnexSchemaOperations.ts"],"names":[],"mappings":"AAEA,OAAO,EAAU,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,qBAAa,oBAAqB,YAAW,gBAAgB;IAG/C,OAAO,CAAC,UAAU;IAF9B,OAAO,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"KnexSchemaOperations.d.ts","sourceRoot":"","sources":["../../src/KnexSchemaOperations.ts"],"names":[],"mappings":"AAEA,OAAO,EAAU,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,qBAAa,oBAAqB,YAAW,gBAAgB;IAG/C,OAAO,CAAC,UAAU;IAF9B,OAAO,CAAC,MAAM,CAA+C;gBAEzC,UAAU,EAAE,UAAU;IAEpC,WAAW,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC;IAyC7B,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,YAAY,EAAE,YAAY;IAkE9D,OAAO,CAAC,YAAY;CAwCrB"}
|
|
@@ -37,12 +37,12 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
exports.KnexSchemaOperations = void 0;
|
|
40
|
-
var
|
|
40
|
+
var logger_1 = require("@proteinjs/logger");
|
|
41
41
|
var getColumnFactory_1 = require("./getColumnFactory");
|
|
42
42
|
var KnexSchemaOperations = /** @class */ (function () {
|
|
43
43
|
function KnexSchemaOperations(knexDriver) {
|
|
44
44
|
this.knexDriver = knexDriver;
|
|
45
|
-
this.logger = new
|
|
45
|
+
this.logger = new logger_1.Logger({ name: this.constructor.name });
|
|
46
46
|
}
|
|
47
47
|
KnexSchemaOperations.prototype.createTable = function (table) {
|
|
48
48
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -62,16 +62,16 @@ var KnexSchemaOperations = /** @class */ (function () {
|
|
|
62
62
|
for (var columnPropertyName in table.columns) {
|
|
63
63
|
var column = table.columns[columnPropertyName];
|
|
64
64
|
_this.createColumn(column, table, tableBuilder);
|
|
65
|
-
_this.logger.info("[".concat(table.name, "] Creating column: ").concat(column.name));
|
|
65
|
+
_this.logger.info({ message: "[".concat(table.name, "] Creating column: ").concat(column.name) });
|
|
66
66
|
}
|
|
67
67
|
tableBuilder.primary(['id']);
|
|
68
|
-
_this.logger.info("[".concat(table.name, "] Creating primary key: id"));
|
|
68
|
+
_this.logger.info({ message: "[".concat(table.name, "] Creating primary key: id") });
|
|
69
69
|
if (table.indexes) {
|
|
70
70
|
for (var _i = 0, _a = table.indexes; _i < _a.length; _i++) {
|
|
71
71
|
var index = _a[_i];
|
|
72
72
|
var columnNames = index.columns.map(function (columnPropertyName) { return table.columns[columnPropertyName].name; });
|
|
73
73
|
tableBuilder.index(columnNames, index.name);
|
|
74
|
-
_this.logger.info("[".concat(table.name, "] Creating index: ").concat(columnNames));
|
|
74
|
+
_this.logger.info({ message: "[".concat(table.name, "] Creating index: ").concat(columnNames) });
|
|
75
75
|
}
|
|
76
76
|
}
|
|
77
77
|
})
|
|
@@ -106,28 +106,30 @@ var KnexSchemaOperations = /** @class */ (function () {
|
|
|
106
106
|
for (var _i = 0, _a = tableChanges.columnsToCreate; _i < _a.length; _i++) {
|
|
107
107
|
var columnPropertyName = _a[_i];
|
|
108
108
|
var column = table.columns[columnPropertyName];
|
|
109
|
-
_this.logger.info("[".concat(table.name, "] Creating column: ").concat(column.name));
|
|
109
|
+
_this.logger.info({ message: "[".concat(table.name, "] Creating column: ").concat(column.name) });
|
|
110
110
|
_this.createColumn(column, table, tableBuilder, tableChanges);
|
|
111
111
|
}
|
|
112
112
|
for (var _b = 0, _c = tableChanges.columnsWithUniqueConstraintsToDrop; _b < _c.length; _b++) {
|
|
113
113
|
var column = _c[_b];
|
|
114
114
|
tableBuilder.dropUnique([column]);
|
|
115
|
-
_this.logger.info("[".concat(table.name, ".").concat(column, "] Dropping unique constraint"));
|
|
115
|
+
_this.logger.info({ message: "[".concat(table.name, ".").concat(column, "] Dropping unique constraint") });
|
|
116
116
|
}
|
|
117
117
|
for (var _d = 0, _e = tableChanges.columnsWithForeignKeysToDrop; _d < _e.length; _d++) {
|
|
118
118
|
var column = _e[_d];
|
|
119
119
|
tableBuilder.dropForeign([column]);
|
|
120
|
-
_this.logger.info("[".concat(table.name, ".").concat(column, "] Dropping foreign key"));
|
|
120
|
+
_this.logger.info({ message: "[".concat(table.name, ".").concat(column, "] Dropping foreign key") });
|
|
121
121
|
}
|
|
122
122
|
for (var _f = 0, _g = tableChanges.indexesToDrop; _f < _g.length; _f++) {
|
|
123
123
|
var index = _g[_f];
|
|
124
124
|
tableBuilder.dropIndex(index.columns);
|
|
125
|
-
_this.logger.info("[".concat(table.name, "] Dropping index: ").concat(JSON.stringify(index)));
|
|
125
|
+
_this.logger.info({ message: "[".concat(table.name, "] Dropping index: ").concat(JSON.stringify(index)) });
|
|
126
126
|
}
|
|
127
127
|
for (var _h = 0, _j = tableChanges.columnsToAlter; _h < _j.length; _h++) {
|
|
128
128
|
var columnPropertyName = _j[_h];
|
|
129
129
|
var column = table.columns[columnPropertyName];
|
|
130
|
-
_this.logger.info(
|
|
130
|
+
_this.logger.info({
|
|
131
|
+
message: "[".concat(table.name, ".").concat(column.name, "] Altering column type to: ").concat(column.constructor.name),
|
|
132
|
+
});
|
|
131
133
|
_this.createColumn(column, table, tableBuilder, tableChanges).alter();
|
|
132
134
|
}
|
|
133
135
|
for (var _k = 0, _l = tableChanges.columnsToRename; _k < _l.length; _k++) {
|
|
@@ -137,12 +139,12 @@ var KnexSchemaOperations = /** @class */ (function () {
|
|
|
137
139
|
continue;
|
|
138
140
|
}
|
|
139
141
|
tableBuilder.renameColumn(column.oldName, column.name);
|
|
140
|
-
_this.logger.info("[".concat(table.name, "] Renaming column: ").concat(column.oldName, " -> ").concat(column.name));
|
|
142
|
+
_this.logger.info({ message: "[".concat(table.name, "] Renaming column: ").concat(column.oldName, " -> ").concat(column.name) });
|
|
141
143
|
}
|
|
142
144
|
for (var _m = 0, _o = tableChanges.indexesToCreate; _m < _o.length; _m++) {
|
|
143
145
|
var index = _o[_m];
|
|
144
146
|
tableBuilder.index(index.columns);
|
|
145
|
-
_this.logger.info("[".concat(table.name, "] Creating index:
|
|
147
|
+
_this.logger.info({ message: "[".concat(table.name, "] Creating index:"), obj: { index: index } });
|
|
146
148
|
}
|
|
147
149
|
})
|
|
148
150
|
.catch(function (reason) {
|
|
@@ -165,12 +167,14 @@ var KnexSchemaOperations = /** @class */ (function () {
|
|
|
165
167
|
if (((_b = (_a = column.options) === null || _a === void 0 ? void 0 : _a.unique) === null || _b === void 0 ? void 0 : _b.unique) &&
|
|
166
168
|
(!tableChanges || tableChanges.columnsWithUniqueConstraintsToCreate.includes(column.name))) {
|
|
167
169
|
columnBuilder.unique(column.options.unique.indexName);
|
|
168
|
-
this.logger.info("[".concat(table.name, ".").concat(column.name, "] Adding unique constraint"));
|
|
170
|
+
this.logger.info({ message: "[".concat(table.name, ".").concat(column.name, "] Adding unique constraint") });
|
|
169
171
|
}
|
|
170
172
|
if (((_c = column.options) === null || _c === void 0 ? void 0 : _c.references) &&
|
|
171
173
|
(!tableChanges || tableChanges.columnsWithForeignKeysToCreate.includes(column.name))) {
|
|
172
174
|
columnBuilder.references('id').inTable("".concat(this.knexDriver.getDbName(), ".").concat(column.options.references.table));
|
|
173
|
-
this.logger.info(
|
|
175
|
+
this.logger.info({
|
|
176
|
+
message: "[".concat(table.name, ".").concat(column.name, "] Adding foreign key -> ").concat(column.options.references.table, ".id"),
|
|
177
|
+
});
|
|
174
178
|
}
|
|
175
179
|
if (typeof ((_d = column.options) === null || _d === void 0 ? void 0 : _d.nullable) !== 'undefined') {
|
|
176
180
|
if ((_e = column.options) === null || _e === void 0 ? void 0 : _e.nullable) {
|
|
@@ -179,7 +183,9 @@ var KnexSchemaOperations = /** @class */ (function () {
|
|
|
179
183
|
else {
|
|
180
184
|
columnBuilder.notNullable();
|
|
181
185
|
}
|
|
182
|
-
this.logger.info(
|
|
186
|
+
this.logger.info({
|
|
187
|
+
message: "[".concat(table.name, ".").concat(column.name, "] Adding constraint nullable: ").concat((_f = column.options) === null || _f === void 0 ? void 0 : _f.nullable),
|
|
188
|
+
});
|
|
183
189
|
}
|
|
184
190
|
return columnBuilder;
|
|
185
191
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KnexSchemaOperations.js","sourceRoot":"","sources":["../../src/KnexSchemaOperations.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"KnexSchemaOperations.js","sourceRoot":"","sources":["../../src/KnexSchemaOperations.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,4CAA2C;AAG3C,uDAAsD;AAEtD;IAGE,8BAAoB,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;QAFlC,WAAM,GAAG,IAAI,eAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;IAEhB,CAAC;IAExC,0CAAW,GAAjB,UAAkB,KAAiB;;;;;;;wBAG3B,CAAC,GAAG,IAAI,OAAO,CAAO,UAAC,EAAE,EAAE,EAAE;4BACjC,OAAO,GAAG,EAAE,CAAC;4BACb,MAAM,GAAG,EAAE,CAAC;wBACd,CAAC,CAAC,CAAC;wBAEH,qBAAM,IAAI,CAAC,UAAU;iCAClB,OAAO,EAAE;iCACT,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC;iCAC9C,WAAW,CAAC,KAAK,CAAC,IAAI,EAAE,UAAC,YAA+B;gCACvD,KAAK,IAAM,kBAAkB,IAAI,KAAK,CAAC,OAAO,EAAE;oCAC9C,IAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;oCACjD,KAAI,CAAC,YAAY,CAAC,MAAM,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;oCAC/C,KAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,WAAI,KAAK,CAAC,IAAI,gCAAsB,MAAM,CAAC,IAAI,CAAE,EAAE,CAAC,CAAC;iCAClF;gCAED,YAAY,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;gCAC7B,KAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,WAAI,KAAK,CAAC,IAAI,+BAA4B,EAAE,CAAC,CAAC;gCAE1E,IAAI,KAAK,CAAC,OAAO,EAAE;oCACjB,KAAoB,UAAa,EAAb,KAAA,KAAK,CAAC,OAAO,EAAb,cAAa,EAAb,IAAa,EAAE;wCAA9B,IAAM,KAAK,SAAA;wCACd,IAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CACnC,UAAC,kBAAkB,IAAK,OAAA,KAAK,CAAC,OAAO,CAAC,kBAA4B,CAAC,CAAC,IAAI,EAAhD,CAAgD,CACzE,CAAC;wCACF,YAAY,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;wCAC5C,KAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,WAAI,KAAK,CAAC,IAAI,+BAAqB,WAAW,CAAE,EAAE,CAAC,CAAC;qCACjF;iCACF;4BACH,CAAC,CAAC;iCACD,KAAK,CAAC,UAAC,MAAW;gCACjB,MAAM,CAAC,kCAA2B,KAAK,CAAC,IAAI,uBAAa,MAAM,CAAE,CAAC,CAAC;4BACrE,CAAC,CAAC;iCACD,IAAI,CAAC;gCACJ,OAAO,EAAE,CAAC;4BACZ,CAAC,CAAC,EAAA;;wBA5BJ,SA4BI,CAAC;wBAEL,sBAAO,CAAC,EAAC;;;;KACV;IAEK,yCAAU,GAAhB,UAAiB,KAAiB,EAAE,YAA0B;;;;;;;wBAGtD,CAAC,GAAG,IAAI,OAAO,CAAO,UAAC,EAAE,EAAE,EAAE;4BACjC,OAAO,GAAG,EAAE,CAAC;4BACb,MAAM,GAAG,EAAE,CAAC;wBACd,CAAC,CAAC,CAAC;wBAEH,qBAAM,IAAI,CAAC,UAAU;iCAClB,OAAO,EAAE;iCACT,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC;iCAC9C,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,UAAC,YAA+B;gCACjD,KAAiC,UAA4B,EAA5B,KAAA,YAAY,CAAC,eAAe,EAA5B,cAA4B,EAA5B,IAA4B,EAAE;oCAA1D,IAAM,kBAAkB,SAAA;oCAC3B,IAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;oCACjD,KAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,WAAI,KAAK,CAAC,IAAI,gCAAsB,MAAM,CAAC,IAAI,CAAE,EAAE,CAAC,CAAC;oCACjF,KAAI,CAAC,YAAY,CAAC,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;iCAC9D;gCAED,KAAqB,UAA+C,EAA/C,KAAA,YAAY,CAAC,kCAAkC,EAA/C,cAA+C,EAA/C,IAA+C,EAAE;oCAAjE,IAAM,MAAM,SAAA;oCACf,YAAY,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;oCAClC,KAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,WAAI,KAAK,CAAC,IAAI,cAAI,MAAM,iCAA8B,EAAE,CAAC,CAAC;iCACvF;gCAED,KAAqB,UAAyC,EAAzC,KAAA,YAAY,CAAC,4BAA4B,EAAzC,cAAyC,EAAzC,IAAyC,EAAE;oCAA3D,IAAM,MAAM,SAAA;oCACf,YAAY,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;oCACnC,KAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,WAAI,KAAK,CAAC,IAAI,cAAI,MAAM,2BAAwB,EAAE,CAAC,CAAC;iCACjF;gCAED,KAAoB,UAA0B,EAA1B,KAAA,YAAY,CAAC,aAAa,EAA1B,cAA0B,EAA1B,IAA0B,EAAE;oCAA3C,IAAM,KAAK,SAAA;oCACd,YAAY,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;oCACtC,KAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,WAAI,KAAK,CAAC,IAAI,+BAAqB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAE,EAAE,CAAC,CAAC;iCAC3F;gCAED,KAAiC,UAA2B,EAA3B,KAAA,YAAY,CAAC,cAAc,EAA3B,cAA2B,EAA3B,IAA2B,EAAE;oCAAzD,IAAM,kBAAkB,SAAA;oCAC3B,IAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;oCACjD,KAAI,CAAC,MAAM,CAAC,IAAI,CAAC;wCACf,OAAO,EAAE,WAAI,KAAK,CAAC,IAAI,cAAI,MAAM,CAAC,IAAI,wCAA8B,MAAM,CAAC,WAAW,CAAC,IAAI,CAAE;qCAC9F,CAAC,CAAC;oCACH,KAAI,CAAC,YAAY,CAAC,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC,KAAK,EAAE,CAAC;iCACtE;gCAED,KAAiC,UAA4B,EAA5B,KAAA,YAAY,CAAC,eAAe,EAA5B,cAA4B,EAA5B,IAA4B,EAAE;oCAA1D,IAAM,kBAAkB,SAAA;oCAC3B,IAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;oCACjD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;wCACnB,SAAS;qCACV;oCAED,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;oCACvD,KAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,WAAI,KAAK,CAAC,IAAI,gCAAsB,MAAM,CAAC,OAAO,iBAAO,MAAM,CAAC,IAAI,CAAE,EAAE,CAAC,CAAC;iCACvG;gCAED,KAAoB,UAA4B,EAA5B,KAAA,YAAY,CAAC,eAAe,EAA5B,cAA4B,EAA5B,IAA4B,EAAE;oCAA7C,IAAM,KAAK,SAAA;oCACd,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;oCAClC,KAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,WAAI,KAAK,CAAC,IAAI,sBAAmB,EAAE,GAAG,EAAE,EAAE,KAAK,OAAA,EAAE,EAAE,CAAC,CAAC;iCAClF;4BACH,CAAC,CAAC;iCACD,KAAK,CAAC,UAAC,MAAW;gCACjB,MAAM,CAAC,iCAA0B,KAAK,CAAC,IAAI,uBAAa,MAAM,CAAE,CAAC,CAAC;4BACpE,CAAC,CAAC;iCACD,IAAI,CAAC;gCACJ,OAAO,EAAE,CAAC;4BACZ,CAAC,CAAC,EAAA;;wBArDJ,SAqDI,CAAC;wBAEL,sBAAO,CAAC,EAAC;;;;KACV;IAEO,2CAAY,GAApB,UACE,MAAwB,EACxB,KAAiB,EACjB,YAA+B,EAC/B,YAA2B;;QAE3B,IAAM,aAAa,GAAG,IAAA,mCAAgB,EAAC,MAAM,CAAC,CAAC;QAC/C,IAAM,aAAa,GAAG,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QACjE,IACE,CAAA,MAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,MAAM,0CAAE,MAAM;YAC9B,CAAC,CAAC,YAAY,IAAI,YAAY,CAAC,oCAAoC,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAC1F;YACA,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACtD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,WAAI,KAAK,CAAC,IAAI,cAAI,MAAM,CAAC,IAAI,+BAA4B,EAAE,CAAC,CAAC;SAC1F;QAED,IACE,CAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,UAAU;YAC1B,CAAC,CAAC,YAAY,IAAI,YAAY,CAAC,8BAA8B,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EACpF;YACA,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,UAAG,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,cAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAE,CAAC,CAAC;YAC5G,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;gBACf,OAAO,EAAE,WAAI,KAAK,CAAC,IAAI,cAAI,MAAM,CAAC,IAAI,qCAA2B,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,QAAK;aACtG,CAAC,CAAC;SACJ;QAED,IAAI,OAAO,CAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,QAAQ,CAAA,KAAK,WAAW,EAAE;YACnD,IAAI,MAAA,MAAM,CAAC,OAAO,0CAAE,QAAQ,EAAE;gBAC5B,aAAa,CAAC,QAAQ,EAAE,CAAC;aAC1B;iBAAM;gBACL,aAAa,CAAC,WAAW,EAAE,CAAC;aAC7B;YAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;gBACf,OAAO,EAAE,WAAI,KAAK,CAAC,IAAI,cAAI,MAAM,CAAC,IAAI,2CAAiC,MAAA,MAAM,CAAC,OAAO,0CAAE,QAAQ,CAAE;aAClG,CAAC,CAAC;SACJ;QAED,OAAO,aAAa,CAAC;IACvB,CAAC;IACH,2BAAC;AAAD,CAAC,AAxJD,IAwJC;AAxJY,oDAAoB"}
|
package/generated/index.ts
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@proteinjs/db-driver-knex",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.17",
|
|
4
4
|
"description": "Db driver for Knex",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -22,8 +22,9 @@
|
|
|
22
22
|
"test": "jest"
|
|
23
23
|
},
|
|
24
24
|
"dependencies": {
|
|
25
|
-
"@proteinjs/db": "^1.5.
|
|
26
|
-
"@proteinjs/db-query": "^1.2.
|
|
25
|
+
"@proteinjs/db": "^1.5.7",
|
|
26
|
+
"@proteinjs/db-query": "^1.2.7",
|
|
27
|
+
"@proteinjs/logger": "1.0.4",
|
|
27
28
|
"@proteinjs/reflection": "1.1.8",
|
|
28
29
|
"@proteinjs/util": "1.4.0",
|
|
29
30
|
"knex": "0.21.5",
|
|
@@ -48,5 +49,5 @@
|
|
|
48
49
|
},
|
|
49
50
|
"main": "./dist/generated/index.js",
|
|
50
51
|
"types": "./dist/generated/index.d.ts",
|
|
51
|
-
"gitHead": "
|
|
52
|
+
"gitHead": "16c2c7eac3d6c1f01a5bca9b24c1e949e295757e"
|
|
52
53
|
}
|
package/src/KnexDriver.ts
CHANGED
|
@@ -9,14 +9,14 @@ import {
|
|
|
9
9
|
tableByName,
|
|
10
10
|
} from '@proteinjs/db';
|
|
11
11
|
import { KnexConfig } from './KnexConfig';
|
|
12
|
-
import { Logger } from '@proteinjs/
|
|
12
|
+
import { Logger } from '@proteinjs/logger';
|
|
13
13
|
import { Statement } from '@proteinjs/db-query';
|
|
14
14
|
import { KnexSchemaOperations } from './KnexSchemaOperations';
|
|
15
15
|
import { KnexColumnTypeFactory } from './KnexColumnTypeFactory';
|
|
16
16
|
|
|
17
17
|
export class KnexDriver implements DbDriver {
|
|
18
18
|
private static KNEX: knex;
|
|
19
|
-
private logger = new Logger(this.constructor.name);
|
|
19
|
+
private logger = new Logger({ name: this.constructor.name });
|
|
20
20
|
private config: KnexConfig;
|
|
21
21
|
private knexConfig: any;
|
|
22
22
|
public getTable: ((name: string) => Table<any>) | undefined;
|
|
@@ -77,7 +77,7 @@ export class KnexDriver implements DbDriver {
|
|
|
77
77
|
await this.getKnex().raw('SET GLOBAL max_allowed_packet=1073741824;');
|
|
78
78
|
await this.getKnex().destroy();
|
|
79
79
|
KnexDriver.KNEX = knex(this.knexConfig);
|
|
80
|
-
this.logger.info('Set global max_allowed_packet size to 1gb');
|
|
80
|
+
this.logger.info({ message: 'Set global max_allowed_packet size to 1gb' });
|
|
81
81
|
}
|
|
82
82
|
|
|
83
83
|
getTableManager(): TableManager {
|
|
@@ -122,7 +122,7 @@ export class KnexDriver implements DbDriver {
|
|
|
122
122
|
try {
|
|
123
123
|
return (await this.getKnex().raw(sql, params as any))[0]; // returns 2 arrays, first is records, second is metadata per record
|
|
124
124
|
} catch (error: any) {
|
|
125
|
-
this.logger.error(`Failed when executing
|
|
125
|
+
this.logger.error({ message: `Failed when executing sql`, obj: { sql }, error });
|
|
126
126
|
throw error;
|
|
127
127
|
}
|
|
128
128
|
}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import * as knex from 'knex';
|
|
2
|
-
import { Logger } from '@proteinjs/
|
|
2
|
+
import { Logger } from '@proteinjs/logger';
|
|
3
3
|
import { Column, Table, SchemaOperations, TableChanges } from '@proteinjs/db';
|
|
4
4
|
import { KnexDriver } from './KnexDriver';
|
|
5
5
|
import { getColumnFactory } from './getColumnFactory';
|
|
6
6
|
|
|
7
7
|
export class KnexSchemaOperations implements SchemaOperations {
|
|
8
|
-
private logger = new Logger(this.constructor.name);
|
|
8
|
+
private logger = new Logger({ name: this.constructor.name });
|
|
9
9
|
|
|
10
10
|
constructor(private knexDriver: KnexDriver) {}
|
|
11
11
|
|
|
@@ -24,11 +24,11 @@ export class KnexSchemaOperations implements SchemaOperations {
|
|
|
24
24
|
for (const columnPropertyName in table.columns) {
|
|
25
25
|
const column = table.columns[columnPropertyName];
|
|
26
26
|
this.createColumn(column, table, tableBuilder);
|
|
27
|
-
this.logger.info(`[${table.name}] Creating column: ${column.name}`);
|
|
27
|
+
this.logger.info({ message: `[${table.name}] Creating column: ${column.name}` });
|
|
28
28
|
}
|
|
29
29
|
|
|
30
30
|
tableBuilder.primary(['id']);
|
|
31
|
-
this.logger.info(`[${table.name}] Creating primary key: id`);
|
|
31
|
+
this.logger.info({ message: `[${table.name}] Creating primary key: id` });
|
|
32
32
|
|
|
33
33
|
if (table.indexes) {
|
|
34
34
|
for (const index of table.indexes) {
|
|
@@ -36,7 +36,7 @@ export class KnexSchemaOperations implements SchemaOperations {
|
|
|
36
36
|
(columnPropertyName) => table.columns[columnPropertyName as string].name
|
|
37
37
|
);
|
|
38
38
|
tableBuilder.index(columnNames, index.name);
|
|
39
|
-
this.logger.info(`[${table.name}] Creating index: ${columnNames}`);
|
|
39
|
+
this.logger.info({ message: `[${table.name}] Creating index: ${columnNames}` });
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
42
|
})
|
|
@@ -64,28 +64,30 @@ export class KnexSchemaOperations implements SchemaOperations {
|
|
|
64
64
|
.table(table.name, (tableBuilder: knex.TableBuilder) => {
|
|
65
65
|
for (const columnPropertyName of tableChanges.columnsToCreate) {
|
|
66
66
|
const column = table.columns[columnPropertyName];
|
|
67
|
-
this.logger.info(`[${table.name}] Creating column: ${column.name}`);
|
|
67
|
+
this.logger.info({ message: `[${table.name}] Creating column: ${column.name}` });
|
|
68
68
|
this.createColumn(column, table, tableBuilder, tableChanges);
|
|
69
69
|
}
|
|
70
70
|
|
|
71
71
|
for (const column of tableChanges.columnsWithUniqueConstraintsToDrop) {
|
|
72
72
|
tableBuilder.dropUnique([column]);
|
|
73
|
-
this.logger.info(`[${table.name}.${column}] Dropping unique constraint`);
|
|
73
|
+
this.logger.info({ message: `[${table.name}.${column}] Dropping unique constraint` });
|
|
74
74
|
}
|
|
75
75
|
|
|
76
76
|
for (const column of tableChanges.columnsWithForeignKeysToDrop) {
|
|
77
77
|
tableBuilder.dropForeign([column]);
|
|
78
|
-
this.logger.info(`[${table.name}.${column}] Dropping foreign key`);
|
|
78
|
+
this.logger.info({ message: `[${table.name}.${column}] Dropping foreign key` });
|
|
79
79
|
}
|
|
80
80
|
|
|
81
81
|
for (const index of tableChanges.indexesToDrop) {
|
|
82
82
|
tableBuilder.dropIndex(index.columns);
|
|
83
|
-
this.logger.info(`[${table.name}] Dropping index: ${JSON.stringify(index)}`);
|
|
83
|
+
this.logger.info({ message: `[${table.name}] Dropping index: ${JSON.stringify(index)}` });
|
|
84
84
|
}
|
|
85
85
|
|
|
86
86
|
for (const columnPropertyName of tableChanges.columnsToAlter) {
|
|
87
87
|
const column = table.columns[columnPropertyName];
|
|
88
|
-
this.logger.info(
|
|
88
|
+
this.logger.info({
|
|
89
|
+
message: `[${table.name}.${column.name}] Altering column type to: ${column.constructor.name}`,
|
|
90
|
+
});
|
|
89
91
|
this.createColumn(column, table, tableBuilder, tableChanges).alter();
|
|
90
92
|
}
|
|
91
93
|
|
|
@@ -96,12 +98,12 @@ export class KnexSchemaOperations implements SchemaOperations {
|
|
|
96
98
|
}
|
|
97
99
|
|
|
98
100
|
tableBuilder.renameColumn(column.oldName, column.name);
|
|
99
|
-
this.logger.info(`[${table.name}] Renaming column: ${column.oldName} -> ${column.name}`);
|
|
101
|
+
this.logger.info({ message: `[${table.name}] Renaming column: ${column.oldName} -> ${column.name}` });
|
|
100
102
|
}
|
|
101
103
|
|
|
102
104
|
for (const index of tableChanges.indexesToCreate) {
|
|
103
105
|
tableBuilder.index(index.columns);
|
|
104
|
-
this.logger.info(`[${table.name}] Creating index:
|
|
106
|
+
this.logger.info({ message: `[${table.name}] Creating index:`, obj: { index } });
|
|
105
107
|
}
|
|
106
108
|
})
|
|
107
109
|
.catch((reason: any) => {
|
|
@@ -127,7 +129,7 @@ export class KnexSchemaOperations implements SchemaOperations {
|
|
|
127
129
|
(!tableChanges || tableChanges.columnsWithUniqueConstraintsToCreate.includes(column.name))
|
|
128
130
|
) {
|
|
129
131
|
columnBuilder.unique(column.options.unique.indexName);
|
|
130
|
-
this.logger.info(`[${table.name}.${column.name}] Adding unique constraint`);
|
|
132
|
+
this.logger.info({ message: `[${table.name}.${column.name}] Adding unique constraint` });
|
|
131
133
|
}
|
|
132
134
|
|
|
133
135
|
if (
|
|
@@ -135,7 +137,9 @@ export class KnexSchemaOperations implements SchemaOperations {
|
|
|
135
137
|
(!tableChanges || tableChanges.columnsWithForeignKeysToCreate.includes(column.name))
|
|
136
138
|
) {
|
|
137
139
|
columnBuilder.references('id').inTable(`${this.knexDriver.getDbName()}.${column.options.references.table}`);
|
|
138
|
-
this.logger.info(
|
|
140
|
+
this.logger.info({
|
|
141
|
+
message: `[${table.name}.${column.name}] Adding foreign key -> ${column.options.references.table}.id`,
|
|
142
|
+
});
|
|
139
143
|
}
|
|
140
144
|
|
|
141
145
|
if (typeof column.options?.nullable !== 'undefined') {
|
|
@@ -145,7 +149,9 @@ export class KnexSchemaOperations implements SchemaOperations {
|
|
|
145
149
|
columnBuilder.notNullable();
|
|
146
150
|
}
|
|
147
151
|
|
|
148
|
-
this.logger.info(
|
|
152
|
+
this.logger.info({
|
|
153
|
+
message: `[${table.name}.${column.name}] Adding constraint nullable: ${column.options?.nullable}`,
|
|
154
|
+
});
|
|
149
155
|
}
|
|
150
156
|
|
|
151
157
|
return columnBuilder;
|