@simonbackx/simple-database 1.22.1 → 1.23.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.js +9 -9
- package/dist/index.js.map +1 -1
- package/dist/src/classes/Column.js +6 -6
- package/dist/src/classes/Column.js.map +1 -1
- package/dist/src/classes/Database.d.ts +5 -5
- package/dist/src/classes/Database.js +2 -2
- package/dist/src/classes/Database.js.map +1 -1
- package/dist/src/classes/Factory.js +3 -3
- package/dist/src/classes/Factory.js.map +1 -1
- package/dist/src/classes/ManyToManyRelation.js +7 -7
- package/dist/src/classes/ManyToManyRelation.js.map +1 -1
- package/dist/src/classes/Migration.d.ts +1 -1
- package/dist/src/classes/Migration.js +43 -10
- package/dist/src/classes/Migration.js.map +1 -1
- package/dist/src/classes/Model.d.ts +2 -2
- package/dist/src/classes/Model.test.js +14 -14
- package/dist/src/decorators/Column.d.ts +1 -1
- package/dist/src/models/Migration.js +3 -3
- package/package.json +8 -6
package/dist/index.js
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
4
|
+
tslib_1.__exportStar(require("./src/classes/Database"), exports);
|
|
5
|
+
tslib_1.__exportStar(require("./src/classes/Factory"), exports);
|
|
6
|
+
tslib_1.__exportStar(require("./src/classes/ManyToManyRelation"), exports);
|
|
7
|
+
tslib_1.__exportStar(require("./src/classes/ManyToOneRelation"), exports);
|
|
8
|
+
tslib_1.__exportStar(require("./src/classes/OneToManyRelation"), exports);
|
|
9
|
+
tslib_1.__exportStar(require("./src/classes/Migration"), exports);
|
|
10
|
+
tslib_1.__exportStar(require("./src/classes/Model"), exports);
|
|
11
|
+
tslib_1.__exportStar(require("./src/decorators/Column"), exports);
|
|
12
|
+
tslib_1.__exportStar(require("./src/classes/Column"), exports);
|
|
13
13
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;AAAA,iEAAuC;AACvC,gEAAsC;AACtC,2EAAiD;AACjD,0EAAgD;AAChD,0EAAgD;AAChD,kEAAwC;AACxC,8DAAoC;AACpC,kEAAwC;AACxC,+DAAoC"}
|
|
@@ -3,6 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.Column = void 0;
|
|
4
4
|
const simple_encoding_1 = require("@simonbackx/simple-encoding");
|
|
5
5
|
class Column {
|
|
6
|
+
/**
|
|
7
|
+
* Set the version used for JSON encoding in simple-encoding
|
|
8
|
+
*/
|
|
9
|
+
static setJSONVersion(version) {
|
|
10
|
+
Column.jsonVersion = version;
|
|
11
|
+
}
|
|
6
12
|
constructor(type, name) {
|
|
7
13
|
this.nullable = false;
|
|
8
14
|
this.primary = false;
|
|
@@ -13,12 +19,6 @@ class Column {
|
|
|
13
19
|
this.type = type;
|
|
14
20
|
this.name = name;
|
|
15
21
|
}
|
|
16
|
-
/**
|
|
17
|
-
* Set the version used for JSON encoding in simple-encoding
|
|
18
|
-
*/
|
|
19
|
-
static setJSONVersion(version) {
|
|
20
|
-
Column.jsonVersion = version;
|
|
21
|
-
}
|
|
22
22
|
saveProperty(data) {
|
|
23
23
|
return this.to(data);
|
|
24
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Column.js","sourceRoot":"","sources":["../../../src/classes/Column.ts"],"names":[],"mappings":";;;AAAA,iEAAgF;AAIhF,MAAa,MAAM;
|
|
1
|
+
{"version":3,"file":"Column.js","sourceRoot":"","sources":["../../../src/classes/Column.ts"],"names":[],"mappings":";;;AAAA,iEAAgF;AAIhF,MAAa,MAAM;IAkBf;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,OAAe;QACjC,MAAM,CAAC,WAAW,GAAG,OAAO,CAAC;IACjC,CAAC;IAED,YAAY,IAAgB,EAAE,IAAY;QAtB1C,aAAQ,GAAG,KAAK,CAAC;QACjB,YAAO,GAAG,KAAK,CAAC;QAEhB;;WAEG;QACH,eAAU,GAAG,KAAK,CAAC;QAiBf,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IAED,YAAY,CAAC,IAAS;QAClB,OAAO,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAED,SAAS,CAAC,GAAQ,EAAE,GAAQ;QACxB,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC;IAC1C,CAAC;IAED,uCAAuC;IACvC,IAAI,CAAC,IAAS;QACV,IAAI,IAAI,CAAC,UAAU,EAAE;YACjB,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;SAChC;QACD,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,KAAK,IAAI,EAAE;YAChC,OAAO,IAAI,CAAC;SACf;QACD,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,KAAK,IAAI,EAAE;YACjC,MAAM,IAAI,KAAK,CAAC,uEAAuE,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;SACxG;QACD,QAAQ,IAAI,CAAC,IAAI,EAAE;YACf,KAAK,SAAS;gBACV,4BAA4B;gBAC5B,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;oBACzB,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;iBACvC;gBACD,OAAO,IAAI,CAAC;YAEhB,KAAK,QAAQ;gBACT,4BAA4B;gBAC5B,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;oBACpB,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;iBACtC;gBACD,OAAO,IAAI,CAAC;YAEhB,KAAK,QAAQ;gBACT,OAAO,IAAI,CAAC;YAEhB,KAAK,SAAS;gBACV,4BAA4B;gBAC5B,IAAI,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,EAAE;oBAC1B,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;iBACvC;gBACD,OAAO,IAAI,KAAK,CAAC,CAAC;YAEtB,KAAK,MAAM;gBACP,iCAAiC;gBACjC,OAAO,IAAI,CAAC;YAEhB,KAAK,UAAU;gBACX,iCAAiC;gBACjC,OAAO,IAAI,CAAC;YAEhB,KAAK,MAAM,CAAC,CAAC;gBACT,iCAAiC;gBACjC,IAAI,MAAW,CAAC;gBAChB,IAAI;oBACA,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;iBAC7B;gBAAC,OAAO,CAAC,EAAE;oBACR,yCAAyC;oBACzC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBACjB,MAAM,GAAG,EAAE,CAAC;iBACf;gBAED,IAAI,IAAI,CAAC,OAAO,EAAE;oBACd,IAAI,MAAM,CAAC,OAAO,KAAK,SAAS,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,EAAE;wBAC5D,4EAA4E;wBAC5E,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,4BAAU,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;qBACjF;oBACD,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,4BAAU,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;iBACpG;qBAAM;oBACH,OAAO,CAAC,IAAI,CAAC,4DAA4D,CAAC,CAAC;iBAC9E;gBAED,kEAAkE;gBAClE,OAAO,MAAM,CAAC,OAAO,KAAK,SAAS,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC;aAC7F;YAED,OAAO,CAAC,CAAC;gBACL,mEAAmE;gBACnE,MAAM,CAAC,GAAU,IAAI,CAAC,IAAI,CAAC;gBAC3B,MAAM,IAAI,KAAK,CAAC,OAAO,GAAG,CAAC,GAAG,gBAAgB,CAAC,CAAC;aACnD;SACJ;IACL,CAAC;IAED,uCAAuC;IACvC,EAAE,CAAC,IAAS;QACR,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,KAAK,IAAI,EAAE;YAChC,OAAO,IAAI,CAAC;SACf;QACD,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,KAAK,IAAI,EAAE;YACjC,MAAM,IAAI,KAAK,CAAC,wEAAwE,CAAC,CAAC;SAC7F;QAED,QAAQ,IAAI,CAAC,IAAI,EAAE;YACf,KAAK,SAAS;gBACV,4BAA4B;gBAC5B,OAAO,IAAI,CAAC;YAEhB,KAAK,QAAQ;gBACT,iCAAiC;gBACjC,OAAO,IAAI,CAAC;YAEhB,KAAK,QAAQ;gBACT,OAAO,IAAI,CAAC;YAEhB,KAAK,SAAS;gBACV,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAExB,KAAK,MAAM;gBACP,iCAAiC;gBACjC,OAAO,IAAI,CAAC;YAEhB,KAAK,UAAU;gBACX,iCAAiC;gBACjC,OAAO,IAAI,CAAC;YAEhB,KAAK,MAAM,CAAC,CAAC;gBACT,MAAM,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC;gBAEnC,OAAO,IAAI,CAAC,SAAS,CAAC;oBAClB,OAAO,EAAE,OAAO;oBAChB,KAAK,EAAE,IAAA,8BAAY,EAAC,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC;iBACzC,CAAC,CAAC;aACN;YAED,OAAO,CAAC,CAAC;gBACL,mEAAmE;gBACnE,MAAM,CAAC,GAAU,IAAI,CAAC,IAAI,CAAC;gBAC3B,MAAM,IAAI,KAAK,CAAC,OAAO,GAAG,CAAC,GAAG,gBAAgB,CAAC,CAAC;aACnD;SACJ;IACL,CAAC;;AAlKL,wBAmKC;AAnJkB,kBAAW,GAAG,CAAC,CAAC"}
|
|
@@ -7,16 +7,16 @@ export declare const Database: {
|
|
|
7
7
|
startQuery(): [number, number];
|
|
8
8
|
logQuery(q: any, hrstart: [number, number]): void;
|
|
9
9
|
finishQuery(q: any, hrstart: [number, number]): void;
|
|
10
|
-
select(query: string, values?: any, useConnection?: mysql.PoolConnection
|
|
11
|
-
insert(query: string, values?: any, useConnection?: mysql.PoolConnection
|
|
10
|
+
select(query: string, values?: any, useConnection?: mysql.PoolConnection): Promise<[any[], mysql.FieldInfo[] | undefined]>;
|
|
11
|
+
insert(query: string, values?: any, useConnection?: mysql.PoolConnection): Promise<[{
|
|
12
12
|
insertId: any;
|
|
13
13
|
affectedRows: number;
|
|
14
14
|
}, mysql.FieldInfo[] | undefined]>;
|
|
15
|
-
update(query: string, values?: any, useConnection?: mysql.PoolConnection
|
|
15
|
+
update(query: string, values?: any, useConnection?: mysql.PoolConnection): Promise<[{
|
|
16
16
|
changedRows: number;
|
|
17
17
|
}, mysql.FieldInfo[] | undefined]>;
|
|
18
|
-
delete(query: string, values?: any, useConnection?: mysql.PoolConnection
|
|
18
|
+
delete(query: string, values?: any, useConnection?: mysql.PoolConnection): Promise<[{
|
|
19
19
|
affectedRows: number;
|
|
20
20
|
}, mysql.FieldInfo[] | undefined]>;
|
|
21
|
-
statement(query: string, values?: any, useConnection?: mysql.PoolConnection
|
|
21
|
+
statement(query: string, values?: any, useConnection?: mysql.PoolConnection): Promise<[any, any]>;
|
|
22
22
|
};
|
|
@@ -3,8 +3,8 @@ var _a, _b, _c, _d, _e, _f, _g;
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
4
|
exports.Database = void 0;
|
|
5
5
|
const tslib_1 = require("tslib");
|
|
6
|
-
const fs_1 =
|
|
7
|
-
const mysql_1 =
|
|
6
|
+
const fs_1 = tslib_1.__importDefault(require("fs"));
|
|
7
|
+
const mysql_1 = tslib_1.__importDefault(require("mysql"));
|
|
8
8
|
if (!process.env.DB_DATABASE) {
|
|
9
9
|
throw new Error("Environment variable DB_DATABASE is missing");
|
|
10
10
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Database.js","sourceRoot":"","sources":["../../../src/classes/Database.ts"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"Database.js","sourceRoot":"","sources":["../../../src/classes/Database.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Factory = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const boys_1 =
|
|
6
|
-
const family_names_1 =
|
|
7
|
-
const girls_1 =
|
|
5
|
+
const boys_1 = tslib_1.__importDefault(require("./data/boys"));
|
|
6
|
+
const family_names_1 = tslib_1.__importDefault(require("./data/family-names"));
|
|
7
|
+
const girls_1 = tslib_1.__importDefault(require("./data/girls"));
|
|
8
8
|
class Factory {
|
|
9
9
|
constructor(options) {
|
|
10
10
|
this.options = options;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Factory.js","sourceRoot":"","sources":["../../../src/classes/Factory.ts"],"names":[],"mappings":";;;;AAAA
|
|
1
|
+
{"version":3,"file":"Factory.js","sourceRoot":"","sources":["../../../src/classes/Factory.ts"],"names":[],"mappings":";;;;AAAA,+DAAmC;AACnC,+EAA8C;AAC9C,iEAAqC;AAErC,MAAsB,OAAO;IAEzB,YAAY,OAAgB;QACxB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAGD,WAAW,CAAC,GAAe;QACvB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC;QACnD,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC;IACpB,CAAC;IAED,UAAU,CAA+C,CAAI;QACzD,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9C,CAAC;IAED,YAAY,CAAC,MAAc;QACvB,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,MAAM,UAAU,GAAG,gEAAgE,CAAC;QACpF,MAAM,gBAAgB,GAAG,UAAU,CAAC,MAAM,CAAC;QAC3C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE;YAC7B,MAAM,IAAI,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,gBAAgB,CAAC,CAAC,CAAC;SAC7E;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,eAAe,CAAC,MAAmC;QAC/C,IAAI,KAAe,CAAC;QACpB,QAAQ,MAAM,EAAE;YACZ,KAAK,MAAM;gBACP,KAAK,GAAG,cAAQ,CAAC;gBACjB,MAAM;YACV,KAAK,QAAQ;gBACT,KAAK,GAAG,eAAS,CAAC;gBAClB,MAAM;YACV,KAAK,OAAO;gBACR,KAAK,GAAG,CAAC,GAAG,cAAQ,EAAE,GAAG,eAAS,CAAC,CAAC;gBACpC,MAAM;SACb;QACD,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC;IAED,cAAc;QACV,OAAO,IAAI,CAAC,WAAW,CAAC,sBAAW,CAAC,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,MAAM,GAAG,EAAE;QAC5B,MAAM,GAAG,GAAY,EAAE,CAAC;QACxB,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,MAAM,EAAE,KAAK,EAAE,EAAE;YACzC,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;SACjC;QACD,OAAO,GAAG,CAAC;IACf,CAAC;CACJ;AArDD,0BAqDC"}
|
|
@@ -4,13 +4,6 @@ exports.ManyToManyRelation = void 0;
|
|
|
4
4
|
const Database_1 = require("./Database");
|
|
5
5
|
const Model_1 = require("./Model");
|
|
6
6
|
class ManyToManyRelation {
|
|
7
|
-
constructor(modelA, modelB, modelKey, modelLink) {
|
|
8
|
-
this.sortOrder = "ASC";
|
|
9
|
-
this.modelA = modelA;
|
|
10
|
-
this.modelB = modelB;
|
|
11
|
-
this.modelKey = modelKey;
|
|
12
|
-
this.modelLink = modelLink;
|
|
13
|
-
}
|
|
14
7
|
/**
|
|
15
8
|
* E.g. _models_parents
|
|
16
9
|
*/
|
|
@@ -38,6 +31,13 @@ class ManyToManyRelation {
|
|
|
38
31
|
this.modelB.primary.name.substring(1) +
|
|
39
32
|
(this.modelA === this.modelB ? "B" : ""));
|
|
40
33
|
}
|
|
34
|
+
constructor(modelA, modelB, modelKey, modelLink) {
|
|
35
|
+
this.sortOrder = "ASC";
|
|
36
|
+
this.modelA = modelA;
|
|
37
|
+
this.modelB = modelB;
|
|
38
|
+
this.modelKey = modelKey;
|
|
39
|
+
this.modelLink = modelLink;
|
|
40
|
+
}
|
|
41
41
|
reverse(modelKey) {
|
|
42
42
|
return new ManyToManyRelation(this.modelB, this.modelA, modelKey, this.modelLink);
|
|
43
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManyToManyRelation.js","sourceRoot":"","sources":["../../../src/classes/ManyToManyRelation.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AACtC,mCAAgC;AAEhC,MAAa,kBAAkB;
|
|
1
|
+
{"version":3,"file":"ManyToManyRelation.js","sourceRoot":"","sources":["../../../src/classes/ManyToManyRelation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,33 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
26
|
exports.Migration = void 0;
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
5
|
-
const colors_1 = (0, tslib_1.__importDefault)(require("colors"));
|
|
6
27
|
const fs_1 = require("fs");
|
|
7
28
|
const Migration_1 = require("../models/Migration");
|
|
8
29
|
const Database_1 = require("./Database");
|
|
30
|
+
const simple_logging_1 = require("@simonbackx/simple-logging");
|
|
9
31
|
async function directoryExists(filePath) {
|
|
10
32
|
try {
|
|
11
33
|
return (await fs_1.promises.stat(filePath)).isDirectory();
|
|
@@ -23,7 +45,11 @@ class Migration {
|
|
|
23
45
|
* Given a folder, loop all the folders in that folder and run the migrations in the 'migrations' folder
|
|
24
46
|
*/
|
|
25
47
|
static async runAll(folder) {
|
|
26
|
-
|
|
48
|
+
const dirname = __dirname;
|
|
49
|
+
// Get the current working directory by removing shared part of folder and dirname
|
|
50
|
+
const shared = dirname.split("/").filter((part, index) => part == folder.split("/")[index]).join("/");
|
|
51
|
+
const cwd = folder.replace(shared, "");
|
|
52
|
+
simple_logging_1.logger.log(new simple_logging_1.StyledText('[Migration]').addClass('migration', 'prefix').addTag('migration'), ' ', new simple_logging_1.StyledText('Running all... ').addClass('migration', 'runAll'), new simple_logging_1.StyledText(cwd).addClass('migration', 'folder').addStyle('dim'));
|
|
27
53
|
process.env.DB_MULTIPLE_STATEMENTS = "true";
|
|
28
54
|
// First check if we have migrations table
|
|
29
55
|
const setupMigration = await this.getMigration(__dirname + '/../migrations/000000000-setup-migrations.sql');
|
|
@@ -80,21 +106,28 @@ class Migration {
|
|
|
80
106
|
if (!migration) {
|
|
81
107
|
continue;
|
|
82
108
|
}
|
|
83
|
-
|
|
109
|
+
simple_logging_1.logger.log(new simple_logging_1.StyledText('[Migration]').addClass('migration', 'prefix').addTag('migration'), ' ', new simple_logging_1.StyledText('Running ').addClass('migration', 'start'), new simple_logging_1.StyledText(name).addClass('migration', 'start', 'name'));
|
|
84
110
|
try {
|
|
85
|
-
await
|
|
86
|
-
|
|
87
|
-
|
|
111
|
+
await simple_logging_1.logger.setContext({
|
|
112
|
+
prefixes: [new simple_logging_1.StyledText('[Migration]').addClass('migration', 'prefix'), ' '],
|
|
113
|
+
tags: ['migration']
|
|
114
|
+
}, async () => {
|
|
115
|
+
await migration.up();
|
|
116
|
+
await Migration_1.Migration.markAsExecuted(name);
|
|
117
|
+
});
|
|
118
|
+
simple_logging_1.logger.log(new simple_logging_1.StyledText('[Migration]').addClass('migration', 'prefix').addTag('migration'), ' ', new simple_logging_1.StyledText('✓').addClass('migration', 'success', 'tag'), ' ', new simple_logging_1.StyledText("Migration " + name + " ran successfully").addClass('migration', 'success', 'text'));
|
|
88
119
|
}
|
|
89
120
|
catch (e) {
|
|
90
|
-
|
|
91
|
-
|
|
121
|
+
// Logger.errorWithContext({textColor: ['dim', 'red'], prefix: ' FAILED ', addSpace: true, prefixColor: ['bgRed']}, "Migration " + name + " failed", e)
|
|
122
|
+
simple_logging_1.logger.error(new simple_logging_1.StyledText('[Migration]').addClass('migration', 'prefix').addTag('migration'), ' ', new simple_logging_1.StyledText('✗').addClass('migration', 'failed', 'tag'), ' ', new simple_logging_1.StyledText("Migration " + name + " failed").addClass('migration', 'failed', 'text'), ' ', new simple_logging_1.StyledText(e).addClass('migration', 'failed', 'error'));
|
|
92
123
|
return false;
|
|
93
124
|
}
|
|
94
125
|
}
|
|
126
|
+
simple_logging_1.logger.log(new simple_logging_1.StyledText('[Migration]').addClass('migration', 'prefix').addTag('migration'), ' ', new simple_logging_1.StyledText('✨').addClass('migration', 'success', 'tag', 'all'), ' ', new simple_logging_1.StyledText("All migrations done").addClass('migration', 'success', 'text', 'all'));
|
|
95
127
|
return true;
|
|
96
128
|
}
|
|
97
129
|
static async getMigration(file) {
|
|
130
|
+
var _a;
|
|
98
131
|
let migration;
|
|
99
132
|
if (file.endsWith('.sql')) {
|
|
100
133
|
if (file.endsWith('.down.sql')) {
|
|
@@ -116,7 +149,7 @@ class Migration {
|
|
|
116
149
|
if (!file.endsWith(".ts") && !file.endsWith(".js")) {
|
|
117
150
|
return;
|
|
118
151
|
}
|
|
119
|
-
const imported = await Promise.resolve().then(() =>
|
|
152
|
+
const imported = await (_a = file, Promise.resolve().then(() => __importStar(require(_a))));
|
|
120
153
|
migration = imported.default;
|
|
121
154
|
}
|
|
122
155
|
return migration;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Migration.js","sourceRoot":"","sources":["../../../src/classes/Migration.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Migration.js","sourceRoot":"","sources":["../../../src/classes/Migration.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,12 +2,12 @@ import { Column } from "./Column";
|
|
|
2
2
|
import { ManyToManyRelation } from "./ManyToManyRelation";
|
|
3
3
|
import { ManyToOneRelation } from "./ManyToOneRelation";
|
|
4
4
|
import { OneToManyRelation } from "./OneToManyRelation";
|
|
5
|
-
|
|
5
|
+
type SQLWhere = {
|
|
6
6
|
sign: string;
|
|
7
7
|
value: string | Date | number | null | (string | null)[] | (number | null)[];
|
|
8
8
|
mode?: string;
|
|
9
9
|
};
|
|
10
|
-
|
|
10
|
+
type SQLWhereQuery = {
|
|
11
11
|
[key: string]: string | Date | number | null | SQLWhere | SQLWhere[];
|
|
12
12
|
};
|
|
13
13
|
export declare class Model {
|
|
@@ -24,13 +24,13 @@ describe("Model", () => {
|
|
|
24
24
|
class TestModelFriend extends Model_1.Model {
|
|
25
25
|
}
|
|
26
26
|
TestModelFriend.table = "_testModels_testModels";
|
|
27
|
-
|
|
27
|
+
tslib_1.__decorate([
|
|
28
28
|
(0, Column_1.column)({ type: "integer" })
|
|
29
29
|
], TestModelFriend.prototype, "testModelsIdA", void 0);
|
|
30
|
-
|
|
30
|
+
tslib_1.__decorate([
|
|
31
31
|
(0, Column_1.column)({ type: "integer" })
|
|
32
32
|
], TestModelFriend.prototype, "testModelsIdB", void 0);
|
|
33
|
-
|
|
33
|
+
tslib_1.__decorate([
|
|
34
34
|
(0, Column_1.column)({ type: "integer" })
|
|
35
35
|
], TestModelFriend.prototype, "priority", void 0);
|
|
36
36
|
// Create a new class
|
|
@@ -49,19 +49,19 @@ describe("Model", () => {
|
|
|
49
49
|
TestModel.sortedFriends = new ManyToManyRelation_1.ManyToManyRelation(TestModel, TestModel, "sortedFriends").setSort("priority");
|
|
50
50
|
TestModel.children = new OneToManyRelation_1.OneToManyRelation(TestModel, TestModel, "children", "parentId");
|
|
51
51
|
TestModel.sortedChildren = new OneToManyRelation_1.OneToManyRelation(TestModel, TestModel, "sortedChildren", "parentId").setSort("count");
|
|
52
|
-
|
|
52
|
+
tslib_1.__decorate([
|
|
53
53
|
(0, Column_1.column)({ primary: true, type: "integer" })
|
|
54
54
|
], TestModel.prototype, "id", void 0);
|
|
55
|
-
|
|
55
|
+
tslib_1.__decorate([
|
|
56
56
|
(0, Column_1.column)({ type: "string" })
|
|
57
57
|
], TestModel.prototype, "name", void 0);
|
|
58
|
-
|
|
58
|
+
tslib_1.__decorate([
|
|
59
59
|
(0, Column_1.column)({ type: "integer" })
|
|
60
60
|
], TestModel.prototype, "count", void 0);
|
|
61
|
-
|
|
61
|
+
tslib_1.__decorate([
|
|
62
62
|
(0, Column_1.column)({ type: "boolean" })
|
|
63
63
|
], TestModel.prototype, "isActive", void 0);
|
|
64
|
-
|
|
64
|
+
tslib_1.__decorate([
|
|
65
65
|
(0, Column_1.column)({
|
|
66
66
|
type: "datetime",
|
|
67
67
|
beforeSave: (old) => {
|
|
@@ -74,13 +74,13 @@ describe("Model", () => {
|
|
|
74
74
|
},
|
|
75
75
|
})
|
|
76
76
|
], TestModel.prototype, "createdOn", void 0);
|
|
77
|
-
|
|
77
|
+
tslib_1.__decorate([
|
|
78
78
|
(0, Column_1.column)({ type: "date", nullable: true })
|
|
79
79
|
], TestModel.prototype, "birthDay", void 0);
|
|
80
|
-
|
|
80
|
+
tslib_1.__decorate([
|
|
81
81
|
(0, Column_1.column)({ type: "json", decoder: TestDecoder })
|
|
82
82
|
], TestModel.prototype, "testDecoder", void 0);
|
|
83
|
-
|
|
83
|
+
tslib_1.__decorate([
|
|
84
84
|
(0, Column_1.column)({ foreignKey: TestModel.parent, type: "integer", nullable: true })
|
|
85
85
|
], TestModel.prototype, "parentId", void 0);
|
|
86
86
|
// Create a new class
|
|
@@ -91,13 +91,13 @@ describe("Model", () => {
|
|
|
91
91
|
}
|
|
92
92
|
}
|
|
93
93
|
Dog.table = "dogs";
|
|
94
|
-
|
|
94
|
+
tslib_1.__decorate([
|
|
95
95
|
(0, Column_1.column)({ primary: true, type: "integer" })
|
|
96
96
|
], Dog.prototype, "id", void 0);
|
|
97
|
-
|
|
97
|
+
tslib_1.__decorate([
|
|
98
98
|
(0, Column_1.column)({ type: "string" })
|
|
99
99
|
], Dog.prototype, "name", void 0);
|
|
100
|
-
|
|
100
|
+
tslib_1.__decorate([
|
|
101
101
|
(0, Column_1.column)({
|
|
102
102
|
type: "datetime",
|
|
103
103
|
skipUpdate: true
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Decoder } from "@simonbackx/simple-encoding";
|
|
2
2
|
import { ManyToOneRelation } from "../classes/ManyToOneRelation";
|
|
3
3
|
import { Model } from "../classes/Model";
|
|
4
|
-
export
|
|
4
|
+
export type ColumnType = "integer" | "number" | "string" | "date" | "datetime" | "boolean" | "json";
|
|
5
5
|
export declare function column<Key extends keyof any, Value extends Model>(settings: {
|
|
6
6
|
type: ColumnType;
|
|
7
7
|
primary?: boolean;
|
|
@@ -33,13 +33,13 @@ class Migration extends Model_1.Model {
|
|
|
33
33
|
}
|
|
34
34
|
}
|
|
35
35
|
Migration.table = "migrations";
|
|
36
|
-
|
|
36
|
+
tslib_1.__decorate([
|
|
37
37
|
(0, Column_1.column)({ primary: true, type: "integer" })
|
|
38
38
|
], Migration.prototype, "id", void 0);
|
|
39
|
-
|
|
39
|
+
tslib_1.__decorate([
|
|
40
40
|
(0, Column_1.column)({ type: "string" })
|
|
41
41
|
], Migration.prototype, "file", void 0);
|
|
42
|
-
|
|
42
|
+
tslib_1.__decorate([
|
|
43
43
|
(0, Column_1.column)({ type: "datetime" })
|
|
44
44
|
], Migration.prototype, "executedOn", void 0);
|
|
45
45
|
exports.Migration = Migration;
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@simonbackx/simple-database",
|
|
3
3
|
"main": "./dist/index.js",
|
|
4
4
|
"types": "./dist/index.d.ts",
|
|
5
|
-
"version": "1.
|
|
5
|
+
"version": "1.23.0",
|
|
6
6
|
"scripts": {
|
|
7
7
|
"test": "yarn build && jest",
|
|
8
8
|
"build": "rm -rf ./dist && tsc -p . --declaration && mkdir -p ./dist/src/migrations && cp -a ./src/migrations/*.sql ./dist/src/migrations",
|
|
@@ -13,18 +13,20 @@
|
|
|
13
13
|
"dist"
|
|
14
14
|
],
|
|
15
15
|
"dependencies": {
|
|
16
|
+
"@simonbackx/simple-logging": "^1.0.0",
|
|
16
17
|
"colors": "^1.4.0",
|
|
17
18
|
"mysql": "^2.18.1"
|
|
18
19
|
},
|
|
19
20
|
"peerDependencies": {
|
|
20
|
-
"@simonbackx/simple-encoding": "^2.
|
|
21
|
+
"@simonbackx/simple-encoding": "^2.8.1",
|
|
21
22
|
"mysql": "^2.18.1"
|
|
22
23
|
},
|
|
23
24
|
"devDependencies": {
|
|
24
|
-
"@simonbackx/simple-encoding": "^2.
|
|
25
|
-
"@simonbackx/simple-errors": "^1.
|
|
25
|
+
"@simonbackx/simple-encoding": "^2.8.1",
|
|
26
|
+
"@simonbackx/simple-errors": "^1.4.0",
|
|
26
27
|
"@types/jest": "^27.0.1",
|
|
27
28
|
"@types/mysql": "^2.15.20",
|
|
29
|
+
"@types/node": "^18.11.17",
|
|
28
30
|
"@typescript-eslint/eslint-plugin": "^4.31.0",
|
|
29
31
|
"@typescript-eslint/parser": "^4.31.0",
|
|
30
32
|
"dotenv": "^10.0.0",
|
|
@@ -33,7 +35,7 @@
|
|
|
33
35
|
"eslint-plugin-simple-import-sort": "^7.0.0",
|
|
34
36
|
"jest": "^27.1.1",
|
|
35
37
|
"jest-extended": "^0.11.5",
|
|
36
|
-
"typescript": "^4.4",
|
|
37
|
-
"uuid": "^
|
|
38
|
+
"typescript": "^4.9.4",
|
|
39
|
+
"uuid": "^9.0.0"
|
|
38
40
|
}
|
|
39
41
|
}
|