jcc-express-mvc 1.7.6 → 1.7.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/lib/Command-Line/NodeArtisanCommand.d.ts.map +1 -1
- package/lib/Command-Line/NodeArtisanCommand.js +10 -0
- package/lib/Command-Line/command.d.ts +1 -0
- package/lib/Command-Line/command.d.ts.map +1 -1
- package/lib/Command-Line/command.js +24 -0
- package/lib/Command-Line/files/Observer.d.ts +3 -0
- package/lib/Command-Line/files/Observer.d.ts.map +1 -0
- package/lib/Command-Line/files/Observer.js +49 -0
- package/lib/Jcc-eloquent/lib/BaseModel.d.ts +9 -0
- package/lib/Jcc-eloquent/lib/BaseModel.d.ts.map +1 -1
- package/lib/Jcc-eloquent/lib/BaseModel.js +66 -9
- package/lib/Jcc-eloquent/lib/Builder.d.ts +11 -2
- package/lib/Jcc-eloquent/lib/Builder.d.ts.map +1 -1
- package/lib/Jcc-eloquent/lib/Builder.js +63 -20
- package/lib/Jcc-eloquent/lib/Cast/index.d.ts +9 -2
- package/lib/Jcc-eloquent/lib/Cast/index.d.ts.map +1 -1
- package/lib/Jcc-eloquent/lib/Cast/index.js +66 -31
- package/lib/Jcc-eloquent/lib/Model.d.ts.map +1 -1
- package/lib/Jcc-eloquent/lib/Model.js +5 -3
- package/lib/Jcc-eloquent/lib/QueryBuilder.d.ts +20 -0
- package/lib/Jcc-eloquent/lib/QueryBuilder.d.ts.map +1 -1
- package/lib/Jcc-eloquent/lib/QueryBuilder.js +30 -0
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodeArtisanCommand.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Command-Line/NodeArtisanCommand.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAapC,qBAAa,aAAa;IAExB,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,EAAE,CAAmB;IAC7B,OAAO,CAAC,IAAI,CAAqB;IACjC,OAAO,CAAC,KAAK,CAAsB;IAGnC,OAAO,CAAC,aAAa;IAOrB,OAAO,CAAC,aAAa;
|
|
1
|
+
{"version":3,"file":"NodeArtisanCommand.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Command-Line/NodeArtisanCommand.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAapC,qBAAa,aAAa;IAExB,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,EAAE,CAAmB;IAC7B,OAAO,CAAC,IAAI,CAAqB;IACjC,OAAO,CAAC,KAAK,CAAsB;IAGnC,OAAO,CAAC,aAAa;IAOrB,OAAO,CAAC,aAAa;IA6MrB,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE;CAIrB"}
|
|
@@ -129,6 +129,16 @@ class ConsoleKernel {
|
|
|
129
129
|
}
|
|
130
130
|
process.exit(0);
|
|
131
131
|
});
|
|
132
|
+
this.defineCommand("make:observer").action(async (firstArg, secondArg) => {
|
|
133
|
+
if (!secondArg) {
|
|
134
|
+
await this.make.createObserver(firstArg);
|
|
135
|
+
}
|
|
136
|
+
else {
|
|
137
|
+
const model = secondArg.split(/\=/g)[1];
|
|
138
|
+
await this.make.createObserver(firstArg, model);
|
|
139
|
+
}
|
|
140
|
+
process.exit(0);
|
|
141
|
+
});
|
|
132
142
|
this.defineCommand("queue:work").action(async (firstArg, secondArg) => {
|
|
133
143
|
console.log("Starting the queue worker...");
|
|
134
144
|
const queue = app.resolve("Queue");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Command-Line/command.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Command-Line/command.ts"],"names":[],"mappings":"AAmBA,qBAAa,WAAW;IACtB,gBAAgB,CAAC,cAAc,EAAE,MAAM,EAAE,SAAS,UAAQ,GAAG,GAAG;IAkChE,mBAAmB,CAAC,cAAc,EAAE,MAAM,EAAE,SAAS,UAAQ,GAAG,GAAG;IAkDnE,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,GAAG;IAoBnC,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,GAAG;IA0BvC,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,GAAG;IA4BlE,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG;IA2B/B,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG;IA8B/B,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG;IA8B3B,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,GAAG;IAmC1D,gBAAgB;IA+BhB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,GAAG;CAgClD"}
|
|
@@ -19,6 +19,7 @@ const Event_1 = __importDefault(require("./files/Event"));
|
|
|
19
19
|
const Listener_1 = __importDefault(require("./files/Listener"));
|
|
20
20
|
const jobs_1 = require("./files/jobs");
|
|
21
21
|
const jobClass_1 = require("./files/jobClass");
|
|
22
|
+
const Observer_1 = __importDefault(require("./files/Observer"));
|
|
22
23
|
const rootPath = app_root_path_1.default.path;
|
|
23
24
|
colors_1.default.enable();
|
|
24
25
|
class MakeCommand {
|
|
@@ -259,5 +260,28 @@ class MakeCommand {
|
|
|
259
260
|
console.log(error);
|
|
260
261
|
}
|
|
261
262
|
}
|
|
263
|
+
createObserver(name, model) {
|
|
264
|
+
try {
|
|
265
|
+
if (!name) {
|
|
266
|
+
console.log(colors_1.default.red("Please give a name for your observer"));
|
|
267
|
+
return;
|
|
268
|
+
}
|
|
269
|
+
const observerPath = path_1.default.resolve(`${rootPath}/app/Observers`);
|
|
270
|
+
if (!fs_1.default.existsSync(observerPath)) {
|
|
271
|
+
fs_1.default.mkdirSync(observerPath, { recursive: true });
|
|
272
|
+
}
|
|
273
|
+
const observerFile = `${observerPath}/${name}.ts`;
|
|
274
|
+
if (fs_1.default.existsSync(observerFile)) {
|
|
275
|
+
console.log(colors_1.default.yellow(`${observerPath} Observer already exists`));
|
|
276
|
+
return;
|
|
277
|
+
}
|
|
278
|
+
fs_1.default.writeFileSync(`${observerPath}/${name}.ts`, (0, Observer_1.default)(name, model));
|
|
279
|
+
return console.log(`${name} Observer added successfully [${observerFile}]`);
|
|
280
|
+
}
|
|
281
|
+
catch (err) {
|
|
282
|
+
console.log(colors_1.default.red(`${name} Observer not added`));
|
|
283
|
+
console.log(err.message);
|
|
284
|
+
}
|
|
285
|
+
}
|
|
262
286
|
}
|
|
263
287
|
exports.MakeCommand = MakeCommand;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Observer.d.ts","sourceRoot":"","sources":["../../../../Framework/lib/Command-Line/files/Observer.ts"],"names":[],"mappings":"AAIA,QAAA,MAAM,QAAQ,GAAI,MAAM,MAAM,EAAE,QAAQ,MAAM,WA0C7C,CAAC;AAEF,eAAe,QAAQ,CAAC"}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const injectMode = (model) => {
|
|
4
|
+
return model ? ` ${model.toLowerCase()}: ${model}` : "";
|
|
5
|
+
};
|
|
6
|
+
const observer = (name, model) => `
|
|
7
|
+
${model ? "import {" + model + '} from "@/Model/' + model + '"' : ""}
|
|
8
|
+
|
|
9
|
+
|
|
10
|
+
export class ${name} {
|
|
11
|
+
|
|
12
|
+
//
|
|
13
|
+
creating(${injectMode(model)}) {
|
|
14
|
+
//
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
created(${injectMode(model)}) {
|
|
18
|
+
//
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
saved(${injectMode(model)}) {
|
|
23
|
+
//
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
saving(${injectMode(model)}) {
|
|
27
|
+
//
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
updating(${injectMode(model)}) {
|
|
32
|
+
//
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
updated(${injectMode(model)}) {
|
|
36
|
+
//
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
|
|
40
|
+
deleting(${injectMode(model)}) {
|
|
41
|
+
//
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
deleted(${injectMode(model)}) {
|
|
45
|
+
//
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
`;
|
|
49
|
+
exports.default = observer;
|
|
@@ -20,6 +20,10 @@ export declare class BaseModel extends QueryBuilder {
|
|
|
20
20
|
protected attributes(): Record<string, AttributeOptions>;
|
|
21
21
|
protected syncOriginal(): void;
|
|
22
22
|
getDirty(): Record<string, any>;
|
|
23
|
+
/**
|
|
24
|
+
* Get dirty attributes formatted for database storage
|
|
25
|
+
*/
|
|
26
|
+
getDirtyForSave(): Record<string, any>;
|
|
23
27
|
isDirty(key: string): boolean;
|
|
24
28
|
isClean(key: string): boolean;
|
|
25
29
|
proxy(): this;
|
|
@@ -27,6 +31,11 @@ export declare class BaseModel extends QueryBuilder {
|
|
|
27
31
|
* Apply casts to all _attributes
|
|
28
32
|
*/
|
|
29
33
|
applyCasts(): this;
|
|
34
|
+
/**
|
|
35
|
+
* Prepare attributes for database storage by applying 'toDatabase' casts
|
|
36
|
+
*/
|
|
37
|
+
getAttributesForSave(): Record<string, any>;
|
|
38
|
+
getCasts(): Record<string, string>;
|
|
30
39
|
/**
|
|
31
40
|
* Hide _attributes that should be hidden
|
|
32
41
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseModel.d.ts","sourceRoot":"","sources":["../../../../Framework/lib/Jcc-eloquent/lib/BaseModel.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"BaseModel.d.ts","sourceRoot":"","sources":["../../../../Framework/lib/Jcc-eloquent/lib/BaseModel.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAE3C,qBAAa,SAAU,SAAQ,YAAY;IACzC,SAAS,CAAC,UAAU,EAAE,MAAM,CAAQ;IACpC,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAM;IAClC,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,CAAM;IACjC,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,CAAM;IAChC,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM;IACpD,SAAS,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM;IACxD,SAAS,CAAC,UAAU,EAAE,OAAO,CAAQ;IACrC,SAAS,CAAC,WAAW,EAAE,OAAO,CAAS;IAEvC,SAAS,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAChD,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAC7C,SAAS,CAAC,MAAM,EAAE,OAAO,CAAS;IAKlC,SAAS,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAKnC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAY9B,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG;IAiBpC,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG;IAW9B,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAI3C,SAAS,CAAC,UAAU,IAAI,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC;IAQxD,SAAS,CAAC,YAAY,IAAI,IAAI;IAIvB,QAAQ,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAatC;;OAEG;IACI,eAAe,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAoBtC,OAAO,CAAC,GAAG,EAAE,MAAM;IAInB,OAAO,CAAC,GAAG,EAAE,MAAM;IAInB,KAAK;IA0BZ;;OAEG;IACI,UAAU,IAAI,IAAI;IAKzB;;OAEG;IACI,oBAAoB,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAwB3C,QAAQ,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAKzC;;OAEG;IACI,UAAU,IAAI,IAAI;IAWlB,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAwCpC,SAAS,CAAC,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAItC;;OAEG;IACH,SAAS,CAAC,eAAe;CAyB1B"}
|
|
@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.BaseModel = void 0;
|
|
4
4
|
const Cast_1 = require("./Cast");
|
|
5
5
|
const QueryBuilder_1 = require("./QueryBuilder");
|
|
6
|
+
const Date_1 = require("../../Date");
|
|
7
|
+
const utils_1 = require("./utils");
|
|
6
8
|
class BaseModel extends QueryBuilder_1.QueryBuilder {
|
|
7
9
|
constructor() {
|
|
8
10
|
super(...arguments);
|
|
@@ -25,21 +27,35 @@ class BaseModel extends QueryBuilder_1.QueryBuilder {
|
|
|
25
27
|
return !this.guarded.includes(key);
|
|
26
28
|
}
|
|
27
29
|
fill(data) {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
30
|
+
for (const key in data) {
|
|
31
|
+
if (this.isFillable(key)) {
|
|
32
|
+
this.setAttribute(key, data[key]);
|
|
33
|
+
}
|
|
34
|
+
}
|
|
31
35
|
}
|
|
32
36
|
// -----------------
|
|
33
37
|
// Cast Getters & Setters Only
|
|
34
38
|
// -----------------
|
|
35
39
|
setAttribute(key, value) {
|
|
40
|
+
const studlyKey = utils_1.Utils.studlyCase(key);
|
|
41
|
+
const method = `set${studlyKey}Attribute`;
|
|
42
|
+
if (typeof this[method] === "function") {
|
|
43
|
+
this[method](value);
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
36
46
|
this._attributes[key] = value;
|
|
37
47
|
const cls = this.constructor;
|
|
38
|
-
const casts =
|
|
39
|
-
|
|
40
|
-
|
|
48
|
+
const casts = this.getCasts();
|
|
49
|
+
if (casts[key]) {
|
|
50
|
+
this._attributes[key] = Cast_1.Cast.toModel(casts[key], value);
|
|
51
|
+
}
|
|
41
52
|
}
|
|
42
53
|
getAttribute(key) {
|
|
54
|
+
const studlyKey = utils_1.Utils.studlyCase(key);
|
|
55
|
+
const method = `get${studlyKey}Attribute`;
|
|
56
|
+
if (typeof this[method] === "function") {
|
|
57
|
+
return this[method](this._attributes[key]);
|
|
58
|
+
}
|
|
43
59
|
return this._attributes[key];
|
|
44
60
|
}
|
|
45
61
|
getAttributes() {
|
|
@@ -66,6 +82,25 @@ class BaseModel extends QueryBuilder_1.QueryBuilder {
|
|
|
66
82
|
}
|
|
67
83
|
return dirty;
|
|
68
84
|
}
|
|
85
|
+
/**
|
|
86
|
+
* Get dirty attributes formatted for database storage
|
|
87
|
+
*/
|
|
88
|
+
getDirtyForSave() {
|
|
89
|
+
const dirty = this.getDirty();
|
|
90
|
+
const casts = this.getCasts();
|
|
91
|
+
for (const key in dirty) {
|
|
92
|
+
if (casts[key]) {
|
|
93
|
+
dirty[key] = Cast_1.Cast.toDatabase(casts[key], dirty[key]);
|
|
94
|
+
}
|
|
95
|
+
else if (dirty[key] instanceof Date ||
|
|
96
|
+
(dirty[key] &&
|
|
97
|
+
typeof dirty[key] === "object" &&
|
|
98
|
+
dirty[key].constructor.name === "Date")) {
|
|
99
|
+
dirty[key] = Cast_1.Cast.toDatabase("datetime", new Date_1.Carbon(dirty[key]));
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
return dirty;
|
|
103
|
+
}
|
|
69
104
|
isDirty(key) {
|
|
70
105
|
return this._attributes[key] != this.original[key];
|
|
71
106
|
}
|
|
@@ -103,11 +138,33 @@ class BaseModel extends QueryBuilder_1.QueryBuilder {
|
|
|
103
138
|
* Apply casts to all _attributes
|
|
104
139
|
*/
|
|
105
140
|
applyCasts() {
|
|
106
|
-
|
|
107
|
-
const casts = cls.casts || {};
|
|
108
|
-
Cast_1.Cast.getCastType({ ...casts, ...this.casts() }, this._attributes);
|
|
141
|
+
Cast_1.Cast.applyCastsToModel(this.getCasts(), this._attributes);
|
|
109
142
|
return this;
|
|
110
143
|
}
|
|
144
|
+
/**
|
|
145
|
+
* Prepare attributes for database storage by applying 'toDatabase' casts
|
|
146
|
+
*/
|
|
147
|
+
getAttributesForSave() {
|
|
148
|
+
const attributes = { ...this._attributes };
|
|
149
|
+
const casts = this.getCasts();
|
|
150
|
+
for (const key in attributes) {
|
|
151
|
+
if (casts[key]) {
|
|
152
|
+
attributes[key] = Cast_1.Cast.toDatabase(casts[key], attributes[key]);
|
|
153
|
+
}
|
|
154
|
+
else if (attributes[key] instanceof Date ||
|
|
155
|
+
(attributes[key] &&
|
|
156
|
+
typeof attributes[key] === "object" &&
|
|
157
|
+
attributes[key].constructor.name === "Date")) {
|
|
158
|
+
// Default serialization for non-casted Date objects (like timestamps)
|
|
159
|
+
attributes[key] = Cast_1.Cast.toDatabase("datetime", new Date_1.Carbon(attributes[key]));
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
return attributes;
|
|
163
|
+
}
|
|
164
|
+
getCasts() {
|
|
165
|
+
const cls = this.constructor;
|
|
166
|
+
return { ...(cls.casts || {}), ...this.casts() };
|
|
167
|
+
}
|
|
111
168
|
/**
|
|
112
169
|
* Hide _attributes that should be hidden
|
|
113
170
|
*/
|
|
@@ -39,7 +39,9 @@ export declare class Builder {
|
|
|
39
39
|
* @param
|
|
40
40
|
*/
|
|
41
41
|
select(...columns: string[]): this;
|
|
42
|
-
whereJson(path: string, operator: string | any, value?:
|
|
42
|
+
whereJson(path: string, operator: string | any, value?: any): this;
|
|
43
|
+
orWhereJson(path: string, operator: string | any, value?: any): this;
|
|
44
|
+
private _applyWhereJson;
|
|
43
45
|
/**
|
|
44
46
|
* Add a where clause to the query - Laravel style
|
|
45
47
|
*
|
|
@@ -72,6 +74,8 @@ export declare class Builder {
|
|
|
72
74
|
* query.where('age', '>', 18);
|
|
73
75
|
*/
|
|
74
76
|
where(column: WhereInput, operator?: any, value?: any): this;
|
|
77
|
+
orWhere(column: WhereInput, operator?: any, value?: any): this;
|
|
78
|
+
private _applyWhere;
|
|
75
79
|
whereNull(column: string): this;
|
|
76
80
|
whereNot(column: string, operator: any, value?: any): this;
|
|
77
81
|
orWhereNot(column: string, operator: any, value?: any): this;
|
|
@@ -94,8 +98,13 @@ export declare class Builder {
|
|
|
94
98
|
havingBetween(column: string, values: any[]): this;
|
|
95
99
|
havingNotBetween(column: string, values: any[]): this;
|
|
96
100
|
havingRaw(column: string, values: any[]): this;
|
|
97
|
-
orWhere(column: string, operator: any, value?: any): this;
|
|
98
101
|
whereIn(column: string, values: any[] | ((qb: Knex.QueryBuilder) => void)): this;
|
|
102
|
+
whereDate(column: string, operator: string | any, value?: any): this;
|
|
103
|
+
whereMonth(column: string, operator: string | any, value?: any): this;
|
|
104
|
+
whereDay(column: string, operator: string | any, value?: any): this;
|
|
105
|
+
whereYear(column: string, operator: string | any, value?: any): this;
|
|
106
|
+
whereTime(column: string, operator: string | any, value?: any): this;
|
|
107
|
+
private applyDateQuery;
|
|
99
108
|
whereLike(column: string, value: string): this;
|
|
100
109
|
andWhereLike(column: string, value: string): this;
|
|
101
110
|
orWhereLike(column: string, value: string): this;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Builder.d.ts","sourceRoot":"","sources":["../../../../Framework/lib/Jcc-eloquent/lib/Builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,EACL,cAAc,EACd,YAAY,EAGZ,eAAe,EACf,UAAU,EACX,MAAM,SAAS,CAAC;AAGjB,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,qBAAa,OAAO;IAClB,OAAO,CAAC,SAAS,CAAc;IAC/B,OAAO,CAAC,EAAE,CAAO;IACjB,OAAO,CAAC,YAAY,CAAkC;IACtD,OAAO,CAAC,KAAK,CAA6B;IACnC,SAAS,EAAE,MAAM,EAAE,CAAM;IACzB,UAAU,EAAE,OAAO,CAAQ;;IAM3B,WAAW,IAAI,IAAI;IAKnB,WAAW,IAAI,IAAI;IAMnB,IAAI,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI;IAOxC,QAAQ,CAAC,KAAK,EAAE,OAAO,KAAK;IAK5B,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAM1C,GAAG,CACR,QAAQ,EAAE,MAAM,EAChB,QAAQ,GAAE,MAAa,EACvB,KAAK,GAAE,MAAU,EACjB,OAAO,GAAE,KAAK,GAAG,IAAY,EAC7B,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,GAC9B,IAAI;IAmCA,QAAQ,CACb,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,EAC/B,QAAQ,GAAE,MAAa,EACvB,KAAK,GAAE,MAAU,GAChB,IAAI;IAIA,UAAU,CACf,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,EAC/B,QAAQ,GAAE,MAAa,EACvB,KAAK,GAAE,MAAU,GAChB,IAAI;IAIA,eAAe,IAAI,IAAI,CAAC,YAAY;IAM3C;;OAEG;IACH,IAAI,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAM7B;;;;OAIG;IACH,EAAE,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM;IAKvC,OAAO,CAAC,KAAK,EAAE,MAAM;IAKrB;;OAEG;IACI,KAAK,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAIrC;;;OAGG;IACH,MAAM,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"Builder.d.ts","sourceRoot":"","sources":["../../../../Framework/lib/Jcc-eloquent/lib/Builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -111,17 +111,24 @@ class Builder {
|
|
|
111
111
|
return this;
|
|
112
112
|
}
|
|
113
113
|
whereJson(path, operator, value) {
|
|
114
|
+
return this._applyWhereJson(path, operator, value, "and");
|
|
115
|
+
}
|
|
116
|
+
orWhereJson(path, operator, value) {
|
|
117
|
+
return this._applyWhereJson(path, operator, value, "or");
|
|
118
|
+
}
|
|
119
|
+
_applyWhereJson(path, operator, value, boolean) {
|
|
114
120
|
const [jsonColumn, ...pathParts] = path.split(".");
|
|
115
121
|
const jsonPath = `$.${pathParts.join(".")}`;
|
|
116
|
-
|
|
117
|
-
|
|
122
|
+
const method = boolean === "or" ? "orWhereRaw" : "whereRaw";
|
|
123
|
+
if (value === undefined) {
|
|
124
|
+
this.getQueryBuilder()[method](`JSON_UNQUOTE(JSON_EXTRACT(??, ?)) = ?`, [
|
|
118
125
|
jsonColumn,
|
|
119
126
|
jsonPath,
|
|
120
127
|
operator,
|
|
121
128
|
]);
|
|
122
129
|
}
|
|
123
130
|
else {
|
|
124
|
-
this.getQueryBuilder()
|
|
131
|
+
this.getQueryBuilder()[method](`JSON_UNQUOTE(JSON_EXTRACT(??, ?)) ${operator} ?`, [jsonColumn, jsonPath, value]);
|
|
125
132
|
}
|
|
126
133
|
return this;
|
|
127
134
|
}
|
|
@@ -157,8 +164,14 @@ class Builder {
|
|
|
157
164
|
* query.where('age', '>', 18);
|
|
158
165
|
*/
|
|
159
166
|
where(column, operator, value) {
|
|
167
|
+
return this._applyWhere(column, operator, value, "where");
|
|
168
|
+
}
|
|
169
|
+
orWhere(column, operator, value) {
|
|
170
|
+
return this._applyWhere(column, operator, value, "orWhere");
|
|
171
|
+
}
|
|
172
|
+
_applyWhere(column, operator, value, method = "where") {
|
|
160
173
|
if (typeof column === "function") {
|
|
161
|
-
this.getQueryBuilder()
|
|
174
|
+
this.getQueryBuilder()[method]((qb) => {
|
|
162
175
|
const subQuery = new this.constructor();
|
|
163
176
|
subQuery.queryBuilder = qb;
|
|
164
177
|
column(subQuery);
|
|
@@ -168,10 +181,10 @@ class Builder {
|
|
|
168
181
|
if (Array.isArray(column)) {
|
|
169
182
|
column.forEach((condition) => {
|
|
170
183
|
if (condition.length === 2) {
|
|
171
|
-
this.
|
|
184
|
+
this._applyWhere(condition[0], "=", condition[1], method);
|
|
172
185
|
}
|
|
173
186
|
else if (condition.length === 3) {
|
|
174
|
-
this.
|
|
187
|
+
this._applyWhere(condition[0], condition[1], condition[2], method);
|
|
175
188
|
}
|
|
176
189
|
});
|
|
177
190
|
return this;
|
|
@@ -180,7 +193,7 @@ class Builder {
|
|
|
180
193
|
column !== null &&
|
|
181
194
|
!Array.isArray(column)) {
|
|
182
195
|
Object.entries(column).forEach(([key, val]) => {
|
|
183
|
-
this.
|
|
196
|
+
this._applyWhere(key, "=", val, method);
|
|
184
197
|
});
|
|
185
198
|
return this;
|
|
186
199
|
}
|
|
@@ -188,16 +201,21 @@ class Builder {
|
|
|
188
201
|
const isJson = column.includes(".") && !column.includes(" ");
|
|
189
202
|
// Two-argument form: where(column, value)
|
|
190
203
|
if (value === undefined && operator !== undefined && !isJson) {
|
|
191
|
-
this.getQueryBuilder()
|
|
204
|
+
this.getQueryBuilder()[method](column, "=", operator);
|
|
192
205
|
return this;
|
|
193
206
|
}
|
|
194
207
|
// JSON path handling
|
|
195
208
|
if (isJson) {
|
|
196
|
-
|
|
209
|
+
if (method === "orWhere") {
|
|
210
|
+
this.orWhereJson(column, operator, value || "");
|
|
211
|
+
}
|
|
212
|
+
else {
|
|
213
|
+
this.whereJson(column, operator, value || "");
|
|
214
|
+
}
|
|
197
215
|
return this;
|
|
198
216
|
}
|
|
199
217
|
// Three-argument form: where(column, operator, value)
|
|
200
|
-
this.getQueryBuilder()
|
|
218
|
+
this.getQueryBuilder()[method](column, operator, value || "");
|
|
201
219
|
return this;
|
|
202
220
|
}
|
|
203
221
|
whereNull(column) {
|
|
@@ -301,15 +319,6 @@ class Builder {
|
|
|
301
319
|
this.getQueryBuilder().havingRaw(column, values);
|
|
302
320
|
return this;
|
|
303
321
|
}
|
|
304
|
-
orWhere(column, operator, value) {
|
|
305
|
-
if (value === undefined) {
|
|
306
|
-
this.getQueryBuilder().orWhere(column, operator);
|
|
307
|
-
}
|
|
308
|
-
else {
|
|
309
|
-
this.getQueryBuilder().orWhere(column, operator, value);
|
|
310
|
-
}
|
|
311
|
-
return this;
|
|
312
|
-
}
|
|
313
322
|
whereIn(column, values) {
|
|
314
323
|
if (typeof values === "function") {
|
|
315
324
|
this.getQueryBuilder().whereIn(column, function () {
|
|
@@ -321,6 +330,32 @@ class Builder {
|
|
|
321
330
|
}
|
|
322
331
|
return this;
|
|
323
332
|
}
|
|
333
|
+
whereDate(column, operator, value) {
|
|
334
|
+
return this.applyDateQuery("DATE", column, operator, value);
|
|
335
|
+
}
|
|
336
|
+
whereMonth(column, operator, value) {
|
|
337
|
+
return this.applyDateQuery("MONTH", column, operator, value);
|
|
338
|
+
}
|
|
339
|
+
whereDay(column, operator, value) {
|
|
340
|
+
return this.applyDateQuery("DAY", column, operator, value);
|
|
341
|
+
}
|
|
342
|
+
whereYear(column, operator, value) {
|
|
343
|
+
return this.applyDateQuery("YEAR", column, operator, value);
|
|
344
|
+
}
|
|
345
|
+
whereTime(column, operator, value) {
|
|
346
|
+
return this.applyDateQuery("TIME", column, operator, value);
|
|
347
|
+
}
|
|
348
|
+
applyDateQuery(type, column, operator, value) {
|
|
349
|
+
if (value === undefined) {
|
|
350
|
+
value = operator;
|
|
351
|
+
operator = "=";
|
|
352
|
+
}
|
|
353
|
+
this.getQueryBuilder().whereRaw(`${type}(??) ${operator} ?`, [
|
|
354
|
+
column,
|
|
355
|
+
value,
|
|
356
|
+
]);
|
|
357
|
+
return this;
|
|
358
|
+
}
|
|
324
359
|
whereLike(column, value) {
|
|
325
360
|
this.getQueryBuilder().whereLike(column, `%${value}%`);
|
|
326
361
|
return this;
|
|
@@ -615,8 +650,16 @@ class Builder {
|
|
|
615
650
|
async updateJson(path, value) {
|
|
616
651
|
const [column, ...jsonPathParts] = path.split(".");
|
|
617
652
|
const jsonPath = "$." + jsonPathParts.join(".");
|
|
653
|
+
// Stringify if it's an object/array to ensure it's handled correctly by the DB
|
|
654
|
+
const finalValue = typeof value === "object" && value !== null
|
|
655
|
+
? JSON.stringify(value)
|
|
656
|
+
: value;
|
|
618
657
|
const result = await this.getQueryBuilder().update({
|
|
619
|
-
[column]: this.db.raw(`JSON_SET(??, ?, ?)`, [
|
|
658
|
+
[column]: this.db.raw(`JSON_SET(??, ?, ?)`, [
|
|
659
|
+
column,
|
|
660
|
+
jsonPath,
|
|
661
|
+
finalValue,
|
|
662
|
+
]),
|
|
620
663
|
});
|
|
621
664
|
this.reset();
|
|
622
665
|
return result ? true : false;
|
|
@@ -1,6 +1,13 @@
|
|
|
1
1
|
export declare class Cast {
|
|
2
|
-
static
|
|
3
|
-
|
|
2
|
+
static applyCastsToModel(cast: Record<string, any>, attributes: Record<string, any>): Record<string, any>;
|
|
3
|
+
/**
|
|
4
|
+
* Convert value from database/input to model representation (Laravel's cast)
|
|
5
|
+
*/
|
|
6
|
+
static toModel(castMethod: string, value: any): any;
|
|
7
|
+
/**
|
|
8
|
+
* Convert value from model representation to database/storage representation
|
|
9
|
+
*/
|
|
10
|
+
static toDatabase(castMethod: string, value: any): any;
|
|
4
11
|
private static string;
|
|
5
12
|
private static dateTime;
|
|
6
13
|
private static array;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../Framework/lib/Jcc-eloquent/lib/Cast/index.ts"],"names":[],"mappings":"AAoBA,qBAAa,IAAI;WACD,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../Framework/lib/Jcc-eloquent/lib/Cast/index.ts"],"names":[],"mappings":"AAoBA,qBAAa,IAAI;WACD,iBAAiB,CAC7B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACzB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAgBjC;;OAEG;WACW,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,GAAG;IAqD1D;;OAEG;WACW,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,GAAG;IAmB7D,OAAO,CAAC,MAAM,CAAC,MAAM;IAKrB,OAAO,CAAC,MAAM,CAAC,QAAQ;IAKvB,OAAO,CAAC,MAAM,CAAC,KAAK;IAWpB,OAAO,CAAC,MAAM,CAAC,OAAO;IAKtB,OAAO,CAAC,MAAM,CAAC,OAAO;IAQtB,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAU7B;CACH"}
|
|
@@ -6,69 +6,97 @@ const DatabaseError_1 = require("../Error/DatabaseError");
|
|
|
6
6
|
const constant_1 = require("../Error/constant");
|
|
7
7
|
const types_1 = require("./types");
|
|
8
8
|
class Cast {
|
|
9
|
-
static
|
|
9
|
+
static applyCastsToModel(cast, attributes) {
|
|
10
10
|
try {
|
|
11
11
|
if (Object.keys(cast).length > 0) {
|
|
12
12
|
for (let key in cast) {
|
|
13
|
-
|
|
13
|
+
if (attributes.hasOwnProperty(key)) {
|
|
14
|
+
attributes[key] = this.toModel(cast[key], attributes[key]);
|
|
15
|
+
}
|
|
14
16
|
}
|
|
15
17
|
}
|
|
16
|
-
return
|
|
18
|
+
return attributes;
|
|
17
19
|
}
|
|
18
20
|
catch (error) {
|
|
19
21
|
throw new DatabaseError_1.DatabaseError(error.message, constant_1.CASTING_TYPE_ERROR);
|
|
20
22
|
}
|
|
21
23
|
}
|
|
22
|
-
|
|
24
|
+
/**
|
|
25
|
+
* Convert value from database/input to model representation (Laravel's cast)
|
|
26
|
+
*/
|
|
27
|
+
static toModel(castMethod, value) {
|
|
23
28
|
try {
|
|
24
|
-
if (
|
|
25
|
-
|
|
26
|
-
|
|
29
|
+
if (value === null || value === undefined)
|
|
30
|
+
return value;
|
|
31
|
+
if (castMethod.includes(":") && !castMethod.startsWith("decimal:")) {
|
|
32
|
+
let formatter = castMethod.split(":")[1];
|
|
33
|
+
return this.dateTime(value, formatter);
|
|
27
34
|
}
|
|
28
35
|
const actionType = castMethod.trim();
|
|
29
36
|
if (actionType === types_1.STRING) {
|
|
30
|
-
return
|
|
37
|
+
return this.string(value);
|
|
31
38
|
}
|
|
32
39
|
if (actionType === types_1.INTEGER) {
|
|
33
|
-
return
|
|
40
|
+
return this.integer(value);
|
|
34
41
|
}
|
|
35
42
|
if (actionType === types_1.BOOLEAN) {
|
|
36
|
-
return
|
|
43
|
+
return this.boolean(value);
|
|
37
44
|
}
|
|
38
|
-
// query is not retrieve from the database and is null the key will be deleted
|
|
39
45
|
if (actionType === types_1.ARRAY) {
|
|
40
|
-
|
|
41
|
-
return !query[key] && !query.hasOwnProperty("id")
|
|
42
|
-
? delete query[key]
|
|
43
|
-
: query[key];
|
|
46
|
+
return this.array(value);
|
|
44
47
|
}
|
|
45
|
-
if (
|
|
46
|
-
return
|
|
48
|
+
if (actionType === types_1.DATETIME) {
|
|
49
|
+
return this.dateTime(value, "yyyy-MM-dd HH:mm:ss");
|
|
47
50
|
}
|
|
48
|
-
if (
|
|
49
|
-
return
|
|
51
|
+
if (actionType === types_1.DATE) {
|
|
52
|
+
return this.dateTime(value, "yyyy-MM-dd");
|
|
50
53
|
}
|
|
51
|
-
if (
|
|
52
|
-
return
|
|
54
|
+
if (actionType === types_1.TIME) {
|
|
55
|
+
return this.dateTime(value, "HH:mm:ss");
|
|
53
56
|
}
|
|
54
|
-
if (
|
|
55
|
-
return
|
|
57
|
+
if (actionType === types_1.NOW) {
|
|
58
|
+
return this.dateTime(value, types_1.NOW);
|
|
56
59
|
}
|
|
60
|
+
if (actionType.startsWith("decimal:")) {
|
|
61
|
+
const digits = parseInt(actionType.split(":")[1]) || 2;
|
|
62
|
+
return parseFloat(parseFloat(value).toFixed(digits));
|
|
63
|
+
}
|
|
64
|
+
return value;
|
|
57
65
|
}
|
|
58
66
|
catch (error) {
|
|
59
67
|
throw new DatabaseError_1.DatabaseError(error.message, constant_1.CAST_DAtA_ERROR);
|
|
60
68
|
}
|
|
61
69
|
}
|
|
70
|
+
/**
|
|
71
|
+
* Convert value from model representation to database/storage representation
|
|
72
|
+
*/
|
|
73
|
+
static toDatabase(castMethod, value) {
|
|
74
|
+
if (value === null || value === undefined)
|
|
75
|
+
return value;
|
|
76
|
+
if (value instanceof Date_1.Carbon) {
|
|
77
|
+
if (castMethod === types_1.DATE)
|
|
78
|
+
return value.toDateString();
|
|
79
|
+
if (castMethod === types_1.TIME)
|
|
80
|
+
return value.toTimeString();
|
|
81
|
+
return value.toDateTimeString();
|
|
82
|
+
}
|
|
83
|
+
if (typeof value === "object" || Array.isArray(value)) {
|
|
84
|
+
const actionType = castMethod.trim();
|
|
85
|
+
if (actionType === types_1.ARRAY || actionType === "json") {
|
|
86
|
+
return JSON.stringify(value);
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
return value;
|
|
90
|
+
}
|
|
62
91
|
static string(value) {
|
|
63
|
-
|
|
92
|
+
if (value === null || value === undefined)
|
|
93
|
+
return "";
|
|
94
|
+
return value.toString();
|
|
64
95
|
}
|
|
65
96
|
static dateTime(value, format) {
|
|
66
97
|
if (!value)
|
|
67
98
|
return "";
|
|
68
|
-
|
|
69
|
-
return new Date_1.Carbon(value).diffForHumans();
|
|
70
|
-
}
|
|
71
|
-
return new Date_1.Carbon(value).format(format);
|
|
99
|
+
return new Date_1.Carbon(value);
|
|
72
100
|
}
|
|
73
101
|
static array(data) {
|
|
74
102
|
if (typeof data === "string") {
|
|
@@ -79,13 +107,20 @@ class Cast {
|
|
|
79
107
|
return data;
|
|
80
108
|
}
|
|
81
109
|
}
|
|
82
|
-
return
|
|
110
|
+
return data;
|
|
83
111
|
}
|
|
84
112
|
static integer(value) {
|
|
85
|
-
|
|
113
|
+
if (value === null || value === undefined || value === "")
|
|
114
|
+
return "";
|
|
115
|
+
return Number(value);
|
|
86
116
|
}
|
|
87
117
|
static boolean(value) {
|
|
88
|
-
|
|
118
|
+
if (typeof value === "boolean")
|
|
119
|
+
return value;
|
|
120
|
+
if (typeof value === "string") {
|
|
121
|
+
return value.toLowerCase() === "true" || value === "1";
|
|
122
|
+
}
|
|
123
|
+
return Number(value) >= 1;
|
|
89
124
|
}
|
|
90
125
|
}
|
|
91
126
|
exports.Cast = Cast;
|
|
@@ -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;AAG1C,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;IAmB9D;;OAEG;WACiB,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAQ9D;;OAEG;WAEiB,IAAI,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;WAIhD,GAAG,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;WAIvB,OAAO,CACzB,KAAK,EAAE,GAAG,GAAG,GAAG,EAAE,GACjB,OAAO,CAAC,KAAK,GAAG,KAAK,EAAE,GAAG,IAAI,CAAC;IA+BrB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"Model.d.ts","sourceRoot":"","sources":["../../../../Framework/lib/Jcc-eloquent/lib/Model.ts"],"names":[],"mappings":"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"}
|
|
@@ -63,7 +63,7 @@ class Model extends BaseModel_1.BaseModel {
|
|
|
63
63
|
// console.log(this.observer);
|
|
64
64
|
const instance = new this(data);
|
|
65
65
|
await ModelEvent_1.ModelEvent.fireEvent(this.eventType(), "creating", instance);
|
|
66
|
-
const id = await this.query().insert(instance.
|
|
66
|
+
const id = await this.query().insert(instance.getAttributesForSave());
|
|
67
67
|
if (id)
|
|
68
68
|
instance.exists = true;
|
|
69
69
|
const result = await this.query()
|
|
@@ -131,12 +131,14 @@ class Model extends BaseModel_1.BaseModel {
|
|
|
131
131
|
const query = this.constructor.query();
|
|
132
132
|
if (this.exists) {
|
|
133
133
|
await ModelEvent_1.ModelEvent.fireEvent(this.constructor, "updating", this);
|
|
134
|
-
await query
|
|
134
|
+
await query
|
|
135
|
+
.where(this.primaryKey, this.getKey())
|
|
136
|
+
.update(this.getDirtyForSave());
|
|
135
137
|
await ModelEvent_1.ModelEvent.fireEvent(this.constructor, "updated", this);
|
|
136
138
|
}
|
|
137
139
|
else {
|
|
138
140
|
await ModelEvent_1.ModelEvent.fireEvent(this.constructor, "creating", this);
|
|
139
|
-
const id = await query.insert(this.
|
|
141
|
+
const id = await query.insert(this.getAttributesForSave());
|
|
140
142
|
if (id)
|
|
141
143
|
this.setAttribute(this.primaryKey, id);
|
|
142
144
|
await ModelEvent_1.ModelEvent.fireEvent(this.constructor, "created", this);
|
|
@@ -128,6 +128,26 @@ export declare class QueryBuilder extends ModelEvent {
|
|
|
128
128
|
* Add a where in clause.
|
|
129
129
|
*/
|
|
130
130
|
static whereIn(column: string, values: any[] | ((qb: Knex.QueryBuilder) => void)): Builder;
|
|
131
|
+
/**
|
|
132
|
+
* Add a where date clause.
|
|
133
|
+
*/
|
|
134
|
+
static whereDate(column: string, operator: string | any, value?: any): Builder;
|
|
135
|
+
/**
|
|
136
|
+
* Add a where month clause.
|
|
137
|
+
*/
|
|
138
|
+
static whereMonth(column: string, operator: string | any, value?: any): Builder;
|
|
139
|
+
/**
|
|
140
|
+
* Add a where day clause.
|
|
141
|
+
*/
|
|
142
|
+
static whereDay(column: string, operator: string | any, value?: any): Builder;
|
|
143
|
+
/**
|
|
144
|
+
* Add a where year clause.
|
|
145
|
+
*/
|
|
146
|
+
static whereYear(column: string, operator: string | any, value?: any): Builder;
|
|
147
|
+
/**
|
|
148
|
+
* Add a where time clause.
|
|
149
|
+
*/
|
|
150
|
+
static whereTime(column: string, operator: string | any, value?: any): Builder;
|
|
131
151
|
/**
|
|
132
152
|
* Add a where like clause with wildcards.
|
|
133
153
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBuilder.d.ts","sourceRoot":"","sources":["../../../../Framework/lib/Jcc-eloquent/lib/QueryBuilder.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"QueryBuilder.d.ts","sourceRoot":"","sources":["../../../../Framework/lib/Jcc-eloquent/lib/QueryBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -205,6 +205,36 @@ class QueryBuilder extends ModelEvent_1.ModelEvent {
|
|
|
205
205
|
static whereIn(column, values) {
|
|
206
206
|
return this.query().whereIn(column, values);
|
|
207
207
|
}
|
|
208
|
+
/**
|
|
209
|
+
* Add a where date clause.
|
|
210
|
+
*/
|
|
211
|
+
static whereDate(column, operator, value) {
|
|
212
|
+
return this.query().whereDate(column, operator, value);
|
|
213
|
+
}
|
|
214
|
+
/**
|
|
215
|
+
* Add a where month clause.
|
|
216
|
+
*/
|
|
217
|
+
static whereMonth(column, operator, value) {
|
|
218
|
+
return this.query().whereMonth(column, operator, value);
|
|
219
|
+
}
|
|
220
|
+
/**
|
|
221
|
+
* Add a where day clause.
|
|
222
|
+
*/
|
|
223
|
+
static whereDay(column, operator, value) {
|
|
224
|
+
return this.query().whereDay(column, operator, value);
|
|
225
|
+
}
|
|
226
|
+
/**
|
|
227
|
+
* Add a where year clause.
|
|
228
|
+
*/
|
|
229
|
+
static whereYear(column, operator, value) {
|
|
230
|
+
return this.query().whereYear(column, operator, value);
|
|
231
|
+
}
|
|
232
|
+
/**
|
|
233
|
+
* Add a where time clause.
|
|
234
|
+
*/
|
|
235
|
+
static whereTime(column, operator, value) {
|
|
236
|
+
return this.query().whereTime(column, operator, value);
|
|
237
|
+
}
|
|
208
238
|
/**
|
|
209
239
|
* Add a where like clause with wildcards.
|
|
210
240
|
*/
|