@proteinjs/db 1.5.5 → 1.5.7
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 +41 -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/Columns.d.ts.map +1 -1
- package/dist/src/Columns.js.map +1 -1
- package/dist/src/Db.d.ts.map +1 -1
- package/dist/src/Db.js +14 -4
- package/dist/src/Db.js.map +1 -1
- package/dist/src/MigrationRunner.d.ts.map +1 -1
- package/dist/src/MigrationRunner.js +6 -4
- package/dist/src/MigrationRunner.js.map +1 -1
- package/dist/src/Record.d.ts.map +1 -1
- package/dist/src/Record.js +6 -4
- package/dist/src/Record.js.map +1 -1
- package/dist/src/TableWatcherRunner.d.ts.map +1 -1
- package/dist/src/TableWatcherRunner.js +26 -26
- package/dist/src/TableWatcherRunner.js.map +1 -1
- package/dist/src/auth/TableServiceAuth.d.ts.map +1 -1
- package/dist/src/auth/TableServiceAuth.js +3 -3
- package/dist/src/auth/TableServiceAuth.js.map +1 -1
- package/dist/src/reference/ReferenceArray.d.ts.map +1 -1
- package/dist/src/reference/ReferenceArray.js.map +1 -1
- package/dist/src/schema/TableManager.d.ts.map +1 -1
- package/dist/src/schema/TableManager.js +6 -6
- package/dist/src/schema/TableManager.js.map +1 -1
- package/dist/src/source/SourceRecordLoader.d.ts.map +1 -1
- package/dist/src/source/SourceRecordLoader.js +10 -3
- package/dist/src/source/SourceRecordLoader.js.map +1 -1
- package/generated/index.ts +1 -0
- package/package.json +4 -3
- package/src/Columns.ts +0 -1
- package/src/Db.ts +14 -6
- package/src/MigrationRunner.ts +6 -6
- package/src/Record.ts +6 -4
- package/src/TableWatcherRunner.ts +26 -26
- package/src/auth/TableServiceAuth.ts +3 -3
- package/src/reference/ReferenceArray.ts +0 -1
- package/src/schema/TableManager.ts +6 -6
- package/src/source/SourceRecordLoader.ts +10 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TableWatcherRunner.js","sourceRoot":"","sources":["../../src/TableWatcherRunner.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"TableWatcherRunner.js","sourceRoot":"","sources":["../../src/TableWatcherRunner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TableServiceAuth.d.ts","sourceRoot":"","sources":["../../../src/auth/TableServiceAuth.ts"],"names":[],"mappings":"AAIA,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"TableServiceAuth.d.ts","sourceRoot":"","sources":["../../../src/auth/TableServiceAuth.ts"],"names":[],"mappings":"AAIA,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,MAAM,CAA+C;IAE7D,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO;CA0BpD"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.TableServiceAuth = void 0;
|
|
4
|
-
var
|
|
4
|
+
var logger_1 = require("@proteinjs/logger");
|
|
5
5
|
var Table_1 = require("../Table");
|
|
6
6
|
var TableAuth_1 = require("./TableAuth");
|
|
7
7
|
var TableServiceAuth = /** @class */ (function () {
|
|
8
8
|
function TableServiceAuth() {
|
|
9
|
-
this.logger = new
|
|
9
|
+
this.logger = new logger_1.Logger({ name: this.constructor.name });
|
|
10
10
|
}
|
|
11
11
|
TableServiceAuth.prototype.canAccess = function (methodName, args) {
|
|
12
12
|
try {
|
|
@@ -32,7 +32,7 @@ var TableServiceAuth = /** @class */ (function () {
|
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
34
|
catch (error) {
|
|
35
|
-
this.logger.error(
|
|
35
|
+
this.logger.error({ message: "Failed evaluating auth for method: ".concat(methodName), error: error });
|
|
36
36
|
return false;
|
|
37
37
|
}
|
|
38
38
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TableServiceAuth.js","sourceRoot":"","sources":["../../../src/auth/TableServiceAuth.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"TableServiceAuth.js","sourceRoot":"","sources":["../../../src/auth/TableServiceAuth.ts"],"names":[],"mappings":";;;AAAA,4CAA2C;AAC3C,kCAA0C;AAC1C,yCAAwC;AAExC;IAAA;QACU,WAAM,GAAG,IAAI,eAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;IA4B/D,CAAC;IA1BC,oCAAS,GAAT,UAAU,UAAkB,EAAE,IAAW;QACvC,IAAI;YACF,IAAM,KAAK,GAA2B,IAAI,CAAC,CAAC,CAAC,CAAC;YAC9C,IAAI,CAAC,IAAA,eAAO,EAAC,KAAK,CAAC,EAAE;gBACnB,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;aACrE;YAED,IAAM,SAAS,GAAG,IAAI,qBAAS,EAAE,CAAC;YAClC,IAAI,UAAU,KAAK,KAAK,IAAI,UAAU,IAAI,OAAO,IAAI,UAAU,IAAI,aAAa,EAAE;gBAChF,SAAS,CAAC,QAAQ,CAAC,KAAmB,EAAE,SAAS,CAAC,CAAC;aACpD;iBAAM,IAAI,UAAU,KAAK,QAAQ,EAAE;gBAClC,SAAS,CAAC,SAAS,CAAC,KAAmB,EAAE,SAAS,CAAC,CAAC;aACrD;iBAAM,IAAI,UAAU,KAAK,QAAQ,EAAE;gBAClC,SAAS,CAAC,SAAS,CAAC,KAAmB,EAAE,SAAS,CAAC,CAAC;aACrD;iBAAM,IAAI,UAAU,KAAK,QAAQ,EAAE;gBAClC,SAAS,CAAC,SAAS,CAAC,KAAmB,EAAE,SAAS,CAAC,CAAC;aACrD;iBAAM;gBACL,MAAM,IAAI,KAAK,CAAC,uEAAgE,UAAU,CAAE,CAAC,CAAC;aAC/F;SACF;QAAC,OAAO,KAAU,EAAE;YACnB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,6CAAsC,UAAU,CAAE,EAAE,KAAK,OAAA,EAAE,CAAC,CAAC;YAC1F,OAAO,KAAK,CAAC;SACd;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IACH,uBAAC;AAAD,CAAC,AA7BD,IA6BC;AA7BY,4CAAgB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReferenceArray.d.ts","sourceRoot":"","sources":["../../../src/reference/ReferenceArray.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAEjE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"ReferenceArray.d.ts","sourceRoot":"","sources":["../../../src/reference/ReferenceArray.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAEjE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAInC;;;;;;;;;;;;;GAaG;AACH,qBAAa,cAAc,CAAC,CAAC,SAAS,MAAM,CAAE,YAAW,wBAAwB;IAGtE,MAAM,EAAE,MAAM;IACd,IAAI,EAAE,MAAM,EAAE;IACd,QAAQ,CAAC;IAJX,cAAc,SAA8B;gBAE1C,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EAAE,EACd,QAAQ,CAAC,iBAAK;IAGvB,MAAM,CAAC,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC,EAAE;IAKlG,QAAQ,IAAI,OAAO;IAIb,GAAG,IAAI,OAAO,CAAC,CAAC,EAAE,CAAC;IAiBzB,WAAW,IAAI,CAAC,EAAE,GAAG,SAAS;IAQ9B,SAAS,IAAI,MAAM;IAQnB,GAAG,CAAC,OAAO,EAAE,CAAC,EAAE;CAGjB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReferenceArray.js","sourceRoot":"","sources":["../../../src/reference/ReferenceArray.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,4BAA8B;AAE9B,kCAAuC;AACvC,oFAAqF;AACrF,8DAA6D;
|
|
1
|
+
{"version":3,"file":"ReferenceArray.js","sourceRoot":"","sources":["../../../src/reference/ReferenceArray.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,4BAA8B;AAE9B,kCAAuC;AACvC,oFAAqF;AACrF,8DAA6D;AAC7D;;;;;;;;;;;;;GAaG;AACH;IAEE,wBACS,MAAc,EACd,IAAc,EACd,QAAc;QAFd,WAAM,GAAN,MAAM,CAAQ;QACd,SAAI,GAAJ,IAAI,CAAU;QACd,aAAQ,GAAR,QAAQ,CAAM;QAJhB,mBAAc,GAAG,qDAA0B,CAAC;IAKhD,CAAC;IAEG,0BAAW,GAAlB,UAAqC,KAAa,EAAE,OAA8C;QAChG,IAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,UAAC,MAAM,IAAK,OAAA,MAAM,CAAC,EAAE,EAAT,CAAS,CAAC,CAAC;QAC/C,OAAO,IAAI,cAAc,CAAI,KAAK,EAAE,GAAG,EAAE,OAAc,CAAC,CAAC;IAC3D,CAAC;IAED,iCAAQ,GAAR;QACE,OAAO,IAAI,CAAC,QAAQ,KAAK,SAAS,CAAC;IACrC,CAAC;IAEK,4BAAG,GAAT;;;;;;6BACM,CAAC,IAAI,CAAC,QAAQ,EAAd,wBAAc;6BACZ,CAAA,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAA,EAApB,wBAAoB;wBACtB,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;;;wBAEb,KAAK,GAAG,IAAA,mBAAW,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC;wBACjC,EAAE,GAAG,IAAA,UAAK,GAAE,CAAC;wBACb,EAAE,GAAG,IAAI,yCAAmB,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;wBAC5D,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;wBAChE,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;wBAChD,KAAA,IAAI,CAAA;wBAAY,qBAAM,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC,EAAA;;wBAAzC,GAAK,QAAQ,GAAG,SAAyB,CAAC;;4BAI9C,sBAAO,IAAI,CAAC,QAAQ,EAAC;;;;KACtB;IAED,oCAAW,GAAX;QACE,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,OAAO,IAAI,CAAC,QAAQ,CAAC;SACtB;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,kCAAS,GAAT;QACE,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;SAC7B;QAED,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;IAC1B,CAAC;IAED,4BAAG,GAAH,UAAI,OAAY;QACd,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IACH,qBAAC;AAAD,CAAC,AArDD,IAqDC;AArDY,wCAAc"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TableManager.d.ts","sourceRoot":"","sources":["../../../src/schema/TableManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAa,MAAM,UAAU,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAgB,MAAM,oBAAoB,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEjC,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC;CAC3C;AAED,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"TableManager.d.ts","sourceRoot":"","sources":["../../../src/schema/TableManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAa,MAAM,UAAU,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAgB,MAAM,oBAAoB,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEjC,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC;CAC3C;AAED,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAA+C;IACtD,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,cAAc,EAAE,cAAc,CAAC;gBAGpC,QAAQ,EAAE,QAAQ,EAClB,iBAAiB,EAAE,iBAAiB,EACpC,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,CAAC,EAAE,cAAc;IAO3B,WAAW,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC;IAI7B,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAO3B,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAejD,OAAO,CAAC,gBAAgB;YAgBV,eAAe;YA6Ff,kBAAkB;CA6CjC"}
|
|
@@ -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.TableManager = void 0;
|
|
40
|
-
var
|
|
40
|
+
var logger_1 = require("@proteinjs/logger");
|
|
41
41
|
var Table_1 = require("../Table");
|
|
42
42
|
var SchemaMetadata_1 = require("./SchemaMetadata");
|
|
43
43
|
var TableManager = /** @class */ (function () {
|
|
44
44
|
function TableManager(dbDriver, columnTypeFactory, schemaOperations, schemaMetadata) {
|
|
45
|
-
this.logger = new
|
|
45
|
+
this.logger = new logger_1.Logger({ name: this.constructor.name });
|
|
46
46
|
this.columnTypeFactory = columnTypeFactory;
|
|
47
47
|
this.schemaOperations = schemaOperations;
|
|
48
48
|
this.schemaMetadata = schemaMetadata ? schemaMetadata : new SchemaMetadata_1.SchemaMetadata(dbDriver);
|
|
@@ -93,19 +93,19 @@ var TableManager = /** @class */ (function () {
|
|
|
93
93
|
case 2:
|
|
94
94
|
tableChanges = _a.sent();
|
|
95
95
|
if (!this.shouldAlterTable(tableChanges)) return [3 /*break*/, 4];
|
|
96
|
-
this.logger.info("Altering table: ".concat(table.name));
|
|
96
|
+
this.logger.info({ message: "Altering table: ".concat(table.name) });
|
|
97
97
|
return [4 /*yield*/, this.schemaOperations.alterTable(table, tableChanges)];
|
|
98
98
|
case 3:
|
|
99
99
|
_a.sent();
|
|
100
|
-
this.logger.info("Finished altering table: ".concat(table.name));
|
|
100
|
+
this.logger.info({ message: "Finished altering table: ".concat(table.name) });
|
|
101
101
|
_a.label = 4;
|
|
102
102
|
case 4: return [3 /*break*/, 7];
|
|
103
103
|
case 5:
|
|
104
|
-
this.logger.info("Creating table: ".concat(table.name));
|
|
104
|
+
this.logger.info({ message: "Creating table: ".concat(table.name) });
|
|
105
105
|
return [4 /*yield*/, this.schemaOperations.createTable(table)];
|
|
106
106
|
case 6:
|
|
107
107
|
_a.sent();
|
|
108
|
-
this.logger.info("Finished creating table: ".concat(table.name));
|
|
108
|
+
this.logger.info({ message: "Finished creating table: ".concat(table.name) });
|
|
109
109
|
_a.label = 7;
|
|
110
110
|
case 7: return [2 /*return*/];
|
|
111
111
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TableManager.js","sourceRoot":"","sources":["../../../src/schema/TableManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"TableManager.js","sourceRoot":"","sources":["../../../src/schema/TableManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SourceRecordLoader.d.ts","sourceRoot":"","sources":["../../../src/source/SourceRecordLoader.ts"],"names":[],"mappings":"AAWA,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"SourceRecordLoader.d.ts","sourceRoot":"","sources":["../../../src/source/SourceRecordLoader.ts"],"names":[],"mappings":"AAWA,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,MAAM,CAA+C;IAEvD,IAAI;YA4CI,mBAAmB;CAyBlC"}
|
|
@@ -48,14 +48,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
48
48
|
};
|
|
49
49
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
50
50
|
exports.SourceRecordLoader = void 0;
|
|
51
|
-
var
|
|
51
|
+
var logger_1 = require("@proteinjs/logger");
|
|
52
52
|
var db_query_1 = require("@proteinjs/db-query");
|
|
53
53
|
var SourceRecord_1 = require("./SourceRecord");
|
|
54
54
|
var Db_1 = require("../Db");
|
|
55
55
|
var SourceRecordRepo_1 = require("./SourceRecordRepo");
|
|
56
56
|
var SourceRecordLoader = /** @class */ (function () {
|
|
57
57
|
function SourceRecordLoader() {
|
|
58
|
-
this.logger = new
|
|
58
|
+
this.logger = new logger_1.Logger({ name: this.constructor.name });
|
|
59
59
|
}
|
|
60
60
|
SourceRecordLoader.prototype.load = function () {
|
|
61
61
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -118,7 +118,14 @@ var SourceRecordLoader = /** @class */ (function () {
|
|
|
118
118
|
_d++;
|
|
119
119
|
return [3 /*break*/, 5];
|
|
120
120
|
case 11:
|
|
121
|
-
this.logger.info(
|
|
121
|
+
this.logger.info({
|
|
122
|
+
message: "(".concat(table.name, ") Loaded ").concat(sourceRecords.length, " ").concat(sourceRecords.length == 1 ? 'record' : 'records', " from source"),
|
|
123
|
+
obj: {
|
|
124
|
+
inserts: insertCount,
|
|
125
|
+
updates: updateCount,
|
|
126
|
+
deletes: deleteCount,
|
|
127
|
+
},
|
|
128
|
+
});
|
|
122
129
|
_e.label = 12;
|
|
123
130
|
case 12:
|
|
124
131
|
_i++;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SourceRecordLoader.js","sourceRoot":"","sources":["../../../src/source/SourceRecordLoader.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"SourceRecordLoader.js","sourceRoot":"","sources":["../../../src/source/SourceRecordLoader.ts"],"names":[],"mappings":"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"}
|
package/generated/index.ts
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@proteinjs/db",
|
|
3
|
-
"version": "1.5.
|
|
3
|
+
"version": "1.5.7",
|
|
4
4
|
"description": "Db",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -22,7 +22,8 @@
|
|
|
22
22
|
"test": "jest"
|
|
23
23
|
},
|
|
24
24
|
"dependencies": {
|
|
25
|
-
"@proteinjs/db-query": "^1.2.
|
|
25
|
+
"@proteinjs/db-query": "^1.2.7",
|
|
26
|
+
"@proteinjs/logger": "1.0.4",
|
|
26
27
|
"@proteinjs/reflection": "1.1.8",
|
|
27
28
|
"@proteinjs/serializer": "1.0.14",
|
|
28
29
|
"@proteinjs/server-api": "1.4.1",
|
|
@@ -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/Columns.ts
CHANGED
|
@@ -6,7 +6,6 @@ import { ReferenceArray } from './reference/ReferenceArray';
|
|
|
6
6
|
import { Db } from './Db';
|
|
7
7
|
import { Reference } from './reference/Reference';
|
|
8
8
|
import { QueryBuilderFactory } from './QueryBuilderFactory';
|
|
9
|
-
import { Logger } from '@proteinjs/util';
|
|
10
9
|
|
|
11
10
|
export class IntegerColumn implements Column<number, number> {
|
|
12
11
|
constructor(
|
package/src/Db.ts
CHANGED
|
@@ -3,7 +3,7 @@ import { Service } from '@proteinjs/service';
|
|
|
3
3
|
import { Loadable, SourceRepository } from '@proteinjs/reflection';
|
|
4
4
|
import { Column, Table, getColumnPropertyName, tableByName } from './Table';
|
|
5
5
|
import { Record, RecordSerializer, SerializedRecord } from './Record';
|
|
6
|
-
import { Logger } from '@proteinjs/
|
|
6
|
+
import { Logger } from '@proteinjs/logger';
|
|
7
7
|
import { SourceRecordLoader } from './source/SourceRecordLoader';
|
|
8
8
|
import { ParameterizationConfig, QueryBuilder, Statement, StatementFactory } from '@proteinjs/db-query';
|
|
9
9
|
import { QueryBuilderFactory } from './QueryBuilderFactory';
|
|
@@ -45,7 +45,7 @@ export interface DbDriver {
|
|
|
45
45
|
export class Db<R extends Record = Record> implements DbService<R> {
|
|
46
46
|
private static defaultDbDriver: DbDriver;
|
|
47
47
|
private dbDriver: DbDriver;
|
|
48
|
-
private logger = new Logger(this.constructor.name);
|
|
48
|
+
private logger = new Logger({ name: this.constructor.name });
|
|
49
49
|
private statementConfigFactory: StatementConfigFactory;
|
|
50
50
|
private auth = new TableAuth();
|
|
51
51
|
private tableWatcherRunner = new TableWatcherRunner<R>();
|
|
@@ -208,9 +208,15 @@ export class Db<R extends Record = Record> implements DbService<R> {
|
|
|
208
208
|
for (const cascadeDeleteReference of table.cascadeDeleteReferences()) {
|
|
209
209
|
const referenceTable = tableByName(cascadeDeleteReference.table);
|
|
210
210
|
const referenceColumnPropertyName = getColumnPropertyName(referenceTable, cascadeDeleteReference.referenceColumn);
|
|
211
|
-
this.logger.info(
|
|
212
|
-
`Executing cascade delete for table: ${table.name}
|
|
213
|
-
|
|
211
|
+
this.logger.info({
|
|
212
|
+
message: `Executing cascade delete for table: ${table.name}`,
|
|
213
|
+
obj: {
|
|
214
|
+
table: table.name,
|
|
215
|
+
referenceTable: referenceTable.name,
|
|
216
|
+
referenceColumnPropertyName,
|
|
217
|
+
deletedRecordIds,
|
|
218
|
+
},
|
|
219
|
+
});
|
|
214
220
|
const cascadeDeleteQb = new QueryBuilderFactory().getQueryBuilder(referenceTable);
|
|
215
221
|
cascadeDeleteQb.condition({
|
|
216
222
|
field: referenceColumnPropertyName as string,
|
|
@@ -218,7 +224,9 @@ export class Db<R extends Record = Record> implements DbService<R> {
|
|
|
218
224
|
value: deletedRecordIds,
|
|
219
225
|
});
|
|
220
226
|
const deleteCount = await this.delete(referenceTable, cascadeDeleteQb);
|
|
221
|
-
this.logger.info(
|
|
227
|
+
this.logger.info({
|
|
228
|
+
message: `Cascade deleted ${deleteCount} record${deleteCount == 1 ? '' : 's'}`,
|
|
229
|
+
});
|
|
222
230
|
}
|
|
223
231
|
}
|
|
224
232
|
|
package/src/MigrationRunner.ts
CHANGED
|
@@ -5,13 +5,13 @@ import { SourceRecordRepo } from './source/SourceRecordRepo';
|
|
|
5
5
|
import { MigrationRunnerService, getMigrationRunnerService } from './services/MigrationRunnerService';
|
|
6
6
|
import { Migration, MigrationTable } from './tables/MigrationTable';
|
|
7
7
|
import { Service } from '@proteinjs/service';
|
|
8
|
-
import { Logger } from '@proteinjs/
|
|
8
|
+
import { Logger } from '@proteinjs/logger';
|
|
9
9
|
|
|
10
10
|
export const getMigrationRunner = () =>
|
|
11
11
|
typeof self === 'undefined' ? new MigrationRunner() : (getMigrationRunnerService() as MigrationRunner);
|
|
12
12
|
|
|
13
13
|
export class MigrationRunner implements MigrationRunnerService {
|
|
14
|
-
private logger = new Logger(this.constructor.name);
|
|
14
|
+
private logger = new Logger({ name: this.constructor.name });
|
|
15
15
|
public serviceMetadata: Service['serviceMetadata'] = {
|
|
16
16
|
doNotAwait: true,
|
|
17
17
|
};
|
|
@@ -27,7 +27,7 @@ export class MigrationRunner implements MigrationRunnerService {
|
|
|
27
27
|
migration.status = 'running';
|
|
28
28
|
migration.startTime = moment();
|
|
29
29
|
await db.update(migrationTable, migration);
|
|
30
|
-
this.logger.info(`Running migration (${migration.id}) ${migration.description}`);
|
|
30
|
+
this.logger.info({ message: `Running migration (${migration.id}) ${migration.description}` });
|
|
31
31
|
try {
|
|
32
32
|
migration.output = await migration.run();
|
|
33
33
|
migration.status = 'success';
|
|
@@ -40,9 +40,9 @@ export class MigrationRunner implements MigrationRunnerService {
|
|
|
40
40
|
}
|
|
41
41
|
migration.duration = this.duration(migration.startTime, migration.endTime);
|
|
42
42
|
await db.update(migrationTable, migration);
|
|
43
|
-
this.logger.info(
|
|
44
|
-
`[${migration.status}] (${migration.duration}) Finished running migration (${migration.id}) ${migration.description}
|
|
45
|
-
);
|
|
43
|
+
this.logger.info({
|
|
44
|
+
message: `[${migration.status}] (${migration.duration}) Finished running migration (${migration.id}) ${migration.description}`,
|
|
45
|
+
});
|
|
46
46
|
}
|
|
47
47
|
|
|
48
48
|
private duration(start: Moment, end: Moment): string {
|
package/src/Record.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Logger } from '@proteinjs/
|
|
1
|
+
import { Logger } from '@proteinjs/logger';
|
|
2
2
|
import { DateTimeColumn, UuidColumn } from './Columns';
|
|
3
3
|
import { Column, Table, Columns } from './Table';
|
|
4
4
|
import { moment } from './opt/moment';
|
|
@@ -44,7 +44,7 @@ export function withRecordColumns<T extends Record>(
|
|
|
44
44
|
export type SerializedRecord = { [columnName: string]: any };
|
|
45
45
|
|
|
46
46
|
export class RecordSerializer<T extends Record> {
|
|
47
|
-
private logger
|
|
47
|
+
private logger = new Logger({ name: this.constructor.name });
|
|
48
48
|
private table: Table<T>;
|
|
49
49
|
|
|
50
50
|
constructor(table: Table<T>) {
|
|
@@ -73,7 +73,8 @@ export class RecordSerializer<T extends Record> {
|
|
|
73
73
|
}
|
|
74
74
|
|
|
75
75
|
if (omittedFields.length > 0) {
|
|
76
|
-
|
|
76
|
+
// could mean the developer is passing in an object they don't expect
|
|
77
|
+
this.logger.warn({ message: `Fields were omitted during serialization`, obj: { omittedFields } });
|
|
77
78
|
}
|
|
78
79
|
|
|
79
80
|
return serialized;
|
|
@@ -94,7 +95,8 @@ export class RecordSerializer<T extends Record> {
|
|
|
94
95
|
}
|
|
95
96
|
|
|
96
97
|
if (omittedFields.length > 0) {
|
|
97
|
-
|
|
98
|
+
// expected when passing a base table into the query api
|
|
99
|
+
this.logger.debug({ message: `Fields were omitted during deserialization`, obj: { omittedFields } });
|
|
98
100
|
}
|
|
99
101
|
|
|
100
102
|
return deserialized;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Logger } from '@proteinjs/
|
|
1
|
+
import { Logger } from '@proteinjs/logger';
|
|
2
2
|
import { TableWatcherMap, getTableWatcherMap } from './TableWatcher';
|
|
3
3
|
import { Record } from './Record';
|
|
4
4
|
import { Table } from './Table';
|
|
@@ -6,7 +6,7 @@ import { QueryBuilder } from '@proteinjs/db-query';
|
|
|
6
6
|
|
|
7
7
|
export class TableWatcherRunner<R extends Record = Record> {
|
|
8
8
|
private static tableWatcherMap: TableWatcherMap;
|
|
9
|
-
private logger = new Logger(this.constructor.name);
|
|
9
|
+
private logger = new Logger({ name: this.constructor.name });
|
|
10
10
|
|
|
11
11
|
constructor() {
|
|
12
12
|
if (!TableWatcherRunner.tableWatcherMap) {
|
|
@@ -28,14 +28,14 @@ export class TableWatcherRunner<R extends Record = Record> {
|
|
|
28
28
|
return record;
|
|
29
29
|
}
|
|
30
30
|
|
|
31
|
-
this.logger.info(`(${table.name}) Running before-insert table watchers`);
|
|
31
|
+
this.logger.info({ message: `(${table.name}) Running before-insert table watchers` });
|
|
32
32
|
let updatedRecord: any = record;
|
|
33
33
|
for (const tableWatcher of tableWatchers) {
|
|
34
|
-
this.logger.info(`(${table.name}) Running ${tableWatcher.name()}.beforeInsert`);
|
|
34
|
+
this.logger.info({ message: `(${table.name}) Running ${tableWatcher.name()}.beforeInsert` });
|
|
35
35
|
updatedRecord = await tableWatcher.beforeInsert(updatedRecord);
|
|
36
|
-
this.logger.info(`(${table.name}) Finished running ${tableWatcher.name()}.beforeInsert`);
|
|
36
|
+
this.logger.info({ message: `(${table.name}) Finished running ${tableWatcher.name()}.beforeInsert` });
|
|
37
37
|
}
|
|
38
|
-
this.logger.info(`(${table.name}) Finished running before-insert table watchers`);
|
|
38
|
+
this.logger.info({ message: `(${table.name}) Finished running before-insert table watchers` });
|
|
39
39
|
|
|
40
40
|
return updatedRecord;
|
|
41
41
|
}
|
|
@@ -51,13 +51,13 @@ export class TableWatcherRunner<R extends Record = Record> {
|
|
|
51
51
|
return;
|
|
52
52
|
}
|
|
53
53
|
|
|
54
|
-
this.logger.info(`(${table.name}) Running after-insert table watchers`);
|
|
54
|
+
this.logger.info({ message: `(${table.name}) Running after-insert table watchers` });
|
|
55
55
|
for (const tableWatcher of tableWatchers) {
|
|
56
|
-
this.logger.info(`(${table.name}) Running ${tableWatcher.name()}.afterInsert`);
|
|
56
|
+
this.logger.info({ message: `(${table.name}) Running ${tableWatcher.name()}.afterInsert` });
|
|
57
57
|
await tableWatcher.afterInsert(record);
|
|
58
|
-
this.logger.info(`(${table.name}) Finished running ${tableWatcher.name()}.afterInsert`);
|
|
58
|
+
this.logger.info({ message: `(${table.name}) Finished running ${tableWatcher.name()}.afterInsert` });
|
|
59
59
|
}
|
|
60
|
-
this.logger.info(`(${table.name}) Finished running after-insert table watchers`);
|
|
60
|
+
this.logger.info({ message: `(${table.name}) Finished running after-insert table watchers` });
|
|
61
61
|
}
|
|
62
62
|
|
|
63
63
|
async runBeforeUpdateTableWatchers<T extends R>(
|
|
@@ -75,15 +75,15 @@ export class TableWatcherRunner<R extends Record = Record> {
|
|
|
75
75
|
return record;
|
|
76
76
|
}
|
|
77
77
|
|
|
78
|
-
this.logger.info(`(${table.name}) Running before-update table watchers`);
|
|
78
|
+
this.logger.info({ message: `(${table.name}) Running before-update table watchers` });
|
|
79
79
|
const qbCopy = QueryBuilder.fromQueryBuilder(qb, table.name);
|
|
80
80
|
let updatedRecord: any = record;
|
|
81
81
|
for (const tableWatcher of tableWatchers) {
|
|
82
|
-
this.logger.info(`(${table.name}) Running ${tableWatcher.name()}.beforeUpdate`);
|
|
82
|
+
this.logger.info({ message: `(${table.name}) Running ${tableWatcher.name()}.beforeUpdate` });
|
|
83
83
|
updatedRecord = await tableWatcher.beforeUpdate(updatedRecord, qbCopy);
|
|
84
|
-
this.logger.info(`(${table.name}) Finished running ${tableWatcher.name()}.beforeUpdate`);
|
|
84
|
+
this.logger.info({ message: `(${table.name}) Finished running ${tableWatcher.name()}.beforeUpdate` });
|
|
85
85
|
}
|
|
86
|
-
this.logger.info(`(${table.name}) Finished running before-update table watchers`);
|
|
86
|
+
this.logger.info({ message: `(${table.name}) Finished running before-update table watchers` });
|
|
87
87
|
|
|
88
88
|
return updatedRecord;
|
|
89
89
|
}
|
|
@@ -104,14 +104,14 @@ export class TableWatcherRunner<R extends Record = Record> {
|
|
|
104
104
|
return;
|
|
105
105
|
}
|
|
106
106
|
|
|
107
|
-
this.logger.info(`(${table.name}) Running after-update table watchers`);
|
|
107
|
+
this.logger.info({ message: `(${table.name}) Running after-update table watchers` });
|
|
108
108
|
const qbCopy = QueryBuilder.fromQueryBuilder(qb, table.name);
|
|
109
109
|
for (const tableWatcher of tableWatchers) {
|
|
110
|
-
this.logger.info(`(${table.name}) Running ${tableWatcher.name()}.afterUpdate`);
|
|
110
|
+
this.logger.info({ message: `(${table.name}) Running ${tableWatcher.name()}.afterUpdate` });
|
|
111
111
|
await tableWatcher.afterUpdate(recordUpdateCount, record, qbCopy);
|
|
112
|
-
this.logger.info(`(${table.name}) Finished running ${tableWatcher.name()}.afterUpdate`);
|
|
112
|
+
this.logger.info({ message: `(${table.name}) Finished running ${tableWatcher.name()}.afterUpdate` });
|
|
113
113
|
}
|
|
114
|
-
this.logger.info(`(${table.name}) Finished running after-update table watchers`);
|
|
114
|
+
this.logger.info({ message: `(${table.name}) Finished running after-update table watchers` });
|
|
115
115
|
}
|
|
116
116
|
|
|
117
117
|
async runBeforeDeleteTableWatchers<T extends R>(
|
|
@@ -129,14 +129,14 @@ export class TableWatcherRunner<R extends Record = Record> {
|
|
|
129
129
|
return;
|
|
130
130
|
}
|
|
131
131
|
|
|
132
|
-
this.logger.info(`(${table.name}) Running before-delete table watchers`);
|
|
132
|
+
this.logger.info({ message: `(${table.name}) Running before-delete table watchers` });
|
|
133
133
|
const qbCopy = QueryBuilder.fromQueryBuilder(qb, table.name);
|
|
134
134
|
for (const tableWatcher of tableWatchers) {
|
|
135
|
-
this.logger.info(`(${table.name}) Running ${tableWatcher.name()}.beforeDelete`);
|
|
135
|
+
this.logger.info({ message: `(${table.name}) Running ${tableWatcher.name()}.beforeDelete` });
|
|
136
136
|
await tableWatcher.beforeDelete(recordsToDelete, qbCopy);
|
|
137
|
-
this.logger.info(`(${table.name}) Finished running ${tableWatcher.name()}.beforeDelete`);
|
|
137
|
+
this.logger.info({ message: `(${table.name}) Finished running ${tableWatcher.name()}.beforeDelete` });
|
|
138
138
|
}
|
|
139
|
-
this.logger.info(`(${table.name}) Finished running before-delete table watchers`);
|
|
139
|
+
this.logger.info({ message: `(${table.name}) Finished running before-delete table watchers` });
|
|
140
140
|
}
|
|
141
141
|
|
|
142
142
|
async runAfterDeleteTableWatchers<T extends R>(
|
|
@@ -155,13 +155,13 @@ export class TableWatcherRunner<R extends Record = Record> {
|
|
|
155
155
|
return;
|
|
156
156
|
}
|
|
157
157
|
|
|
158
|
-
this.logger.info(`(${table.name}) Running after-delete table watchers`);
|
|
158
|
+
this.logger.info({ message: `(${table.name}) Running after-delete table watchers` });
|
|
159
159
|
const qbCopy = QueryBuilder.fromQueryBuilder(qb, table.name);
|
|
160
160
|
for (const tableWatcher of tableWatchers) {
|
|
161
|
-
this.logger.info(`(${table.name}) Running ${tableWatcher.name()}.afterDelete`);
|
|
161
|
+
this.logger.info({ message: `(${table.name}) Running ${tableWatcher.name()}.afterDelete` });
|
|
162
162
|
await tableWatcher.afterDelete(recordDeleteCount, deletedRecords, qbCopy);
|
|
163
|
-
this.logger.info(`(${table.name}) Finished running ${tableWatcher.name()}.afterDelete`);
|
|
163
|
+
this.logger.info({ message: `(${table.name}) Finished running ${tableWatcher.name()}.afterDelete` });
|
|
164
164
|
}
|
|
165
|
-
this.logger.info(`(${table.name}) Finished running after-delete table watchers`);
|
|
165
|
+
this.logger.info({ message: `(${table.name}) Finished running after-delete table watchers` });
|
|
166
166
|
}
|
|
167
167
|
}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { Logger } from '@proteinjs/
|
|
1
|
+
import { Logger } from '@proteinjs/logger';
|
|
2
2
|
import { Table, isTable } from '../Table';
|
|
3
3
|
import { TableAuth } from './TableAuth';
|
|
4
4
|
|
|
5
5
|
export class TableServiceAuth {
|
|
6
|
-
private logger = new Logger(this.constructor.name);
|
|
6
|
+
private logger = new Logger({ name: this.constructor.name });
|
|
7
7
|
|
|
8
8
|
canAccess(methodName: string, args: any[]): boolean {
|
|
9
9
|
try {
|
|
@@ -25,7 +25,7 @@ export class TableServiceAuth {
|
|
|
25
25
|
throw new Error(`User is not authorized to access unsupported Db service api: ${methodName}`);
|
|
26
26
|
}
|
|
27
27
|
} catch (error: any) {
|
|
28
|
-
this.logger.error(error
|
|
28
|
+
this.logger.error({ message: `Failed evaluating auth for method: ${methodName}`, error });
|
|
29
29
|
return false;
|
|
30
30
|
}
|
|
31
31
|
|
|
@@ -4,7 +4,6 @@ import { Record } from '../Record';
|
|
|
4
4
|
import { tableByName } from '../Table';
|
|
5
5
|
import { ReferenceArraySerializerId } from '../serializers/ReferenceArraySerializer';
|
|
6
6
|
import { QueryBuilderFactory } from '../QueryBuilderFactory';
|
|
7
|
-
import { Logger } from '@proteinjs/util';
|
|
8
7
|
/**
|
|
9
8
|
* The object returned by Db functions for each field of type ReferenceArrayColumn in a record.
|
|
10
9
|
* The reason for this is to make loading of reference records on-demand. For theoretically
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Logger } from '@proteinjs/
|
|
1
|
+
import { Logger } from '@proteinjs/logger';
|
|
2
2
|
import { Column, Table, getTables } from '../Table';
|
|
3
3
|
import { SchemaOperations, TableChanges } from './SchemaOperations';
|
|
4
4
|
import { SchemaMetadata } from './SchemaMetadata';
|
|
@@ -9,7 +9,7 @@ export interface ColumnTypeFactory {
|
|
|
9
9
|
}
|
|
10
10
|
|
|
11
11
|
export class TableManager {
|
|
12
|
-
private logger = new Logger(this.constructor.name);
|
|
12
|
+
private logger = new Logger({ name: this.constructor.name });
|
|
13
13
|
public columnTypeFactory: ColumnTypeFactory;
|
|
14
14
|
public schemaOperations: SchemaOperations;
|
|
15
15
|
public schemaMetadata: SchemaMetadata;
|
|
@@ -40,14 +40,14 @@ export class TableManager {
|
|
|
40
40
|
if (await this.tableExists(table)) {
|
|
41
41
|
const tableChanges = await this.getTableChanges(table);
|
|
42
42
|
if (this.shouldAlterTable(tableChanges)) {
|
|
43
|
-
this.logger.info(`Altering table: ${table.name}`);
|
|
43
|
+
this.logger.info({ message: `Altering table: ${table.name}` });
|
|
44
44
|
await this.schemaOperations.alterTable(table, tableChanges);
|
|
45
|
-
this.logger.info(`Finished altering table: ${table.name}`);
|
|
45
|
+
this.logger.info({ message: `Finished altering table: ${table.name}` });
|
|
46
46
|
}
|
|
47
47
|
} else {
|
|
48
|
-
this.logger.info(`Creating table: ${table.name}`);
|
|
48
|
+
this.logger.info({ message: `Creating table: ${table.name}` });
|
|
49
49
|
await this.schemaOperations.createTable(table);
|
|
50
|
-
this.logger.info(`Finished creating table: ${table.name}`);
|
|
50
|
+
this.logger.info({ message: `Finished creating table: ${table.name}` });
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
53
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Logger } from '@proteinjs/
|
|
1
|
+
import { Logger } from '@proteinjs/logger';
|
|
2
2
|
import { QueryBuilder } from '@proteinjs/db-query';
|
|
3
3
|
import { getSourceRecordLoaders, SourceRecord, getSourceRecordTables } from './SourceRecord';
|
|
4
4
|
import { Table } from '../Table';
|
|
@@ -10,7 +10,7 @@ type SourceRecordsMap = {
|
|
|
10
10
|
};
|
|
11
11
|
|
|
12
12
|
export class SourceRecordLoader {
|
|
13
|
-
private logger = new Logger(this.constructor.name);
|
|
13
|
+
private logger = new Logger({ name: this.constructor.name });
|
|
14
14
|
|
|
15
15
|
async load() {
|
|
16
16
|
const sourceRecordsMap = await this.getSourceRecordsMap();
|
|
@@ -45,9 +45,14 @@ export class SourceRecordLoader {
|
|
|
45
45
|
new SourceRecordRepo().loadSourceRecord(table.name, sourceRecord as any);
|
|
46
46
|
}
|
|
47
47
|
|
|
48
|
-
this.logger.info(
|
|
49
|
-
`(${table.name}) Loaded ${sourceRecords.length} ${sourceRecords.length == 1 ? 'record' : 'records'} from source
|
|
50
|
-
|
|
48
|
+
this.logger.info({
|
|
49
|
+
message: `(${table.name}) Loaded ${sourceRecords.length} ${sourceRecords.length == 1 ? 'record' : 'records'} from source`,
|
|
50
|
+
obj: {
|
|
51
|
+
inserts: insertCount,
|
|
52
|
+
updates: updateCount,
|
|
53
|
+
deletes: deleteCount,
|
|
54
|
+
},
|
|
55
|
+
});
|
|
51
56
|
}
|
|
52
57
|
}
|
|
53
58
|
|