chyz 2.0.0-rc.19 → 2.0.0-rc.20
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/base/Model.d.ts +3 -4
- package/base/Model.d.ts.map +1 -1
- package/base/Model.js +8 -11
- package/package.json +1 -1
package/base/Model.d.ts
CHANGED
|
@@ -66,7 +66,7 @@ export interface Relation {
|
|
|
66
66
|
}, { sequelize });
|
|
67
67
|
*/
|
|
68
68
|
export declare class Model extends Component {
|
|
69
|
-
|
|
69
|
+
_provider: any;
|
|
70
70
|
_register: any;
|
|
71
71
|
private _tableName;
|
|
72
72
|
private _model;
|
|
@@ -81,9 +81,8 @@ export declare class Model extends Component {
|
|
|
81
81
|
*/
|
|
82
82
|
getDb(): any;
|
|
83
83
|
getDbConnection(): any;
|
|
84
|
-
get
|
|
85
|
-
set
|
|
86
|
-
provider(): any;
|
|
84
|
+
get provider(): any;
|
|
85
|
+
set provider(value: any);
|
|
87
86
|
/**
|
|
88
87
|
*
|
|
89
88
|
*/
|
package/base/Model.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Model.d.ts","sourceRoot":"","sources":["../../src/base/Model.ts"],"names":[],"mappings":"AASA,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAqE,KAAK,IAAI,MAAM,EAAoE,MAAM,WAAW,CAAC;AAGjL,OAAO,EAAC,SAAS,
|
|
1
|
+
{"version":3,"file":"Model.d.ts","sourceRoot":"","sources":["../../src/base/Model.ts"],"names":[],"mappings":"AASA,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAqE,KAAK,IAAI,MAAM,EAAoE,MAAM,WAAW,CAAC;AAGjL,OAAO,EAAC,SAAS,EAAE,GAAG,EAAC,MAAM,WAAW,CAAC;AAGzC,MAAM,WAAW,QAAQ;IACrB,IAAI,EAAE,QAAQ,GAAG,SAAS,GAAG,eAAe,GAAG,WAAW,CAAC;IAC3D,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,EAAE,CAAC,EAAE,GAAG,CAAA;CACX;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoDG;AAEH,qBAAa,KAAM,SAAQ,SAAS;IAChC,SAAS,EAAE,GAAG,CAAC;IACf,SAAS,EAAE,GAAG,CAAC;IACf,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,MAAM,CAAM;IACpB,OAAO,CAAC,WAAW,CAAW;IAC9B,OAAO,CAAC,OAAO,CAAU;gBAGb,SAAS,CAAC,EAAE,WAAW;IA6BnC;;;;;OAKG;IACI,KAAK;IAIL,eAAe;IAItB,IAAI,QAAQ,IAAI,GAAG,CAElB;IAED,IAAI,QAAQ,CAAC,KAAK,EAAE,GAAG,EAEtB;IAGD;;OAEG;IACH,IAAI,MAAM,IAAI,GAAG,CAEhB;IAED,IAAI,MAAM,CAAC,KAAK,EAAE,GAAG,EAEpB;IAEM,IAAI;IAqCJ,KAAK;IAIL,SAAS;IAIT,QAAQ;IAIR,KAAK;IAKL,QAAQ,CAAC,KAAK,EAAE,GAAG;IAInB,KAAK;IAKC,IAAI,CAAC,MAAM,KAAK,EAAE,OAAO,KAAK;IAoC9B,UAAU,CAAC,MAAM,KAAK,EAAE,OAAO,KAAK;IAmC1C,MAAM,CAAC,MAAM,KAAK,EAAE,OAAO,KAAK;IAMhC,MAAM,CAAC,MAAM,KAAK,EAAE,OAAO,KAAK;IAMvC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAkKG;IACU,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,GAA2C;IAMzF;;;OAGG;IACI,OAAO,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAI7B;;;OAGG;IACI,OAAO,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAI7B;;;OAGG;IACI,eAAe,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAK9B,QAAQ;IAIf;;;;OAIG;IACI,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,GAAE,GAAU;IAYpC,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,GAAE,GAAU;IAYxC,YAAY,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,UAAO;IAazC,UAAU;IAIjB;;;;;OAKG;IACI,SAAS,IAAI,QAAQ,EAAE;CAKjC"}
|
package/base/Model.js
CHANGED
|
@@ -90,11 +90,11 @@ class Model extends Component_1.Component {
|
|
|
90
90
|
BaseChyz_1.default.debug("Model constructor", this._tableName);
|
|
91
91
|
// this._sequelize = BaseChyz.getComponent("db").db;
|
|
92
92
|
if (sequelize != null)
|
|
93
|
-
this.
|
|
93
|
+
this._provider = sequelize;
|
|
94
94
|
else
|
|
95
|
-
this.
|
|
95
|
+
this._provider = this.getDb();
|
|
96
96
|
if (!Utils_1.Utils.isEmpty(this.attributes())) {
|
|
97
|
-
this._model = this.
|
|
97
|
+
this._model = this._provider.define(this._tableName, this.attributes(), {
|
|
98
98
|
tableName: this.tableName(),
|
|
99
99
|
timestamps: false,
|
|
100
100
|
createdAt: false,
|
|
@@ -118,14 +118,11 @@ class Model extends Component_1.Component {
|
|
|
118
118
|
getDbConnection() {
|
|
119
119
|
return BaseChyz_1.default.getComponent("db");
|
|
120
120
|
}
|
|
121
|
-
get
|
|
122
|
-
return this.
|
|
121
|
+
get provider() {
|
|
122
|
+
return this._provider;
|
|
123
123
|
}
|
|
124
|
-
set
|
|
125
|
-
this.
|
|
126
|
-
}
|
|
127
|
-
provider() {
|
|
128
|
-
return this._sequelize;
|
|
124
|
+
set provider(value) {
|
|
125
|
+
this._provider = value;
|
|
129
126
|
}
|
|
130
127
|
/**
|
|
131
128
|
*
|
|
@@ -261,7 +258,7 @@ class Model extends Component_1.Component {
|
|
|
261
258
|
delete(params = {}, options = {}) {
|
|
262
259
|
this.errors = {};
|
|
263
260
|
let p = Object.assign(params, this._attributes);
|
|
264
|
-
return this.model().
|
|
261
|
+
return this.model().destroy(p, options);
|
|
265
262
|
}
|
|
266
263
|
/**
|
|
267
264
|
* As there are often use cases in which it is just easier to execute raw / already prepared SQL queries, you can use the sequelize.query method.
|