jcc-express-mvc 1.7.4 → 1.7.5
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/lib/Command-Line/MigrateCommand.d.ts.map +1 -1
- package/lib/Command-Line/MigrateCommand.js +2 -1
- package/lib/Jcc-eloquent/lib/Builder.js +1 -1
- package/lib/Jcc-eloquent/lib/Model.d.ts +0 -4
- package/lib/Jcc-eloquent/lib/Model.d.ts.map +1 -1
- package/lib/Jcc-eloquent/lib/Model.js +4 -25
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MigrateCommand.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Command-Line/MigrateCommand.ts"],"names":[],"mappings":"AAIA,qBAAa,OAAO;IAClB,OAAO,CAAC,aAAa,CAA6C;IAE3D,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAIzB,KAAK;
|
|
1
|
+
{"version":3,"file":"MigrateCommand.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Command-Line/MigrateCommand.ts"],"names":[],"mappings":"AAIA,qBAAa,OAAO;IAClB,OAAO,CAAC,aAAa,CAA6C;IAE3D,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAIzB,KAAK;IAML,KAAK;IAKL,YAAY;CAG1B"}
|
|
@@ -16,7 +16,8 @@ class Migrate {
|
|
|
16
16
|
}
|
|
17
17
|
async fresh() {
|
|
18
18
|
const steps = await Jcc_eloquent_1.Model.select().from("migrations").count();
|
|
19
|
-
|
|
19
|
+
await Jcc_eloquent_1.DB.rollback(steps, this.migrationPath);
|
|
20
|
+
return await this.runMigration();
|
|
20
21
|
}
|
|
21
22
|
async reset() {
|
|
22
23
|
const steps = await Jcc_eloquent_1.Model.select().from("migrations").count();
|
|
@@ -543,7 +543,7 @@ class Builder {
|
|
|
543
543
|
}
|
|
544
544
|
async count(columns = "id") {
|
|
545
545
|
this.applyAggregate("count", columns);
|
|
546
|
-
return utils_1.Utils.countValue(await this.first());
|
|
546
|
+
return utils_1.Utils.countValue((await this.first()).toJSON() || {});
|
|
547
547
|
}
|
|
548
548
|
min(columns) {
|
|
549
549
|
return this.applyAggregate("min", columns);
|
|
@@ -15,10 +15,6 @@ export declare class Model extends BaseModel {
|
|
|
15
15
|
* Creates a records in the database.
|
|
16
16
|
*/
|
|
17
17
|
static create(data: Record<string, any>): Promise<Model>;
|
|
18
|
-
/**
|
|
19
|
-
* Update records.
|
|
20
|
-
*/
|
|
21
|
-
static update(data?: Record<string, any>): Promise<Boolean>;
|
|
22
18
|
/**
|
|
23
19
|
* Delete records.
|
|
24
20
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Model.d.ts","sourceRoot":"","sources":["../../../../Framework/lib/Jcc-eloquent/lib/Model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EACL,MAAM,EACN,OAAO,EACP,SAAS,EACT,aAAa,EACb,OAAO,EACP,QAAQ,EACR,SAAS,EACV,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,qBAAa,KAAM,SAAQ,SAAS;IAClC,OAAc,SAAS,EAAE,MAAM,EAAE,CAAM;IAChC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;gBAE/B,UAAU,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM;IAQzC,QAAQ,IAAI,MAAM;IAOlB,UAAU,IAAI,MAAM;IAIpB,MAAM,IAAI,GAAG;WAOA,QAAQ,CAC1B,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE,MAAM,GAAG,MAAW,GAC5B,OAAO,CAAC,UAAU,CAAC;IAkCtB;;OAEG;WACU,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"Model.d.ts","sourceRoot":"","sources":["../../../../Framework/lib/Jcc-eloquent/lib/Model.ts"],"names":[],"mappings":"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"}
|
|
@@ -69,23 +69,8 @@ class Model extends BaseModel_1.BaseModel {
|
|
|
69
69
|
.table(this.getTable())
|
|
70
70
|
.where("id", id)
|
|
71
71
|
.first();
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
return hydrated instanceof Model ? hydrated : instance;
|
|
75
|
-
}
|
|
76
|
-
/**
|
|
77
|
-
* Update records.
|
|
78
|
-
*/
|
|
79
|
-
static async update(data = {}) {
|
|
80
|
-
const instance = new this(data);
|
|
81
|
-
await ModelEvent_1.ModelEvent.fireEvent(this, "updating", instance);
|
|
82
|
-
if (instance.timestamps) {
|
|
83
|
-
instance.exists = true;
|
|
84
|
-
instance.setAttribute("updated_at", new Date());
|
|
85
|
-
}
|
|
86
|
-
const result = await this.query().update(instance._attributes);
|
|
87
|
-
await ModelEvent_1.ModelEvent.fireEvent(this, "updating", (await this.hydrate(instance)) || instance);
|
|
88
|
-
return result;
|
|
72
|
+
await ModelEvent_1.ModelEvent.fireEvent(this, "created", result || instance);
|
|
73
|
+
return result instanceof Model ? result : instance;
|
|
89
74
|
}
|
|
90
75
|
/**
|
|
91
76
|
* Delete records.
|
|
@@ -101,16 +86,10 @@ class Model extends BaseModel_1.BaseModel {
|
|
|
101
86
|
* Executes the query and loads specified relations.
|
|
102
87
|
*/
|
|
103
88
|
static async find(id) {
|
|
104
|
-
|
|
105
|
-
if (!result)
|
|
106
|
-
return null;
|
|
107
|
-
const hydrated = await this.hydrate(result);
|
|
108
|
-
return hydrated instanceof Model ? hydrated : null;
|
|
89
|
+
return this.query().where("id", id).first();
|
|
109
90
|
}
|
|
110
91
|
static async all() {
|
|
111
|
-
|
|
112
|
-
const hydrated = await this.hydrate(results);
|
|
113
|
-
return Array.isArray(hydrated) ? hydrated : [];
|
|
92
|
+
return this.query().get();
|
|
114
93
|
}
|
|
115
94
|
static async hydrate(items) {
|
|
116
95
|
if (!items)
|