ashpie/swaf
1
0
Fork 0
Code Issues 22 Pull Requests Releases 11 Wiki Activity

ModelQueryResult: also return model original data

Browse Source
This commit is contained in:
Alice Gaudon 2020-09-04 22:44:30 +02:00
parent e29b6369af
commit 7b739ff056
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "wms-core", "name": "wms-core",
"version": "0.21.11", "version": "0.21.12",
"description": "Node web application framework and toolbelt.", "description": "Node web application framework and toolbelt.",
"repository": "https://gitlab.com/ArisuOngaku/wms-core", "repository": "https://gitlab.com/ArisuOngaku/wms-core",
"author": "Alice Gaudon <alice@gaudon.pro>", "author": "Alice Gaudon <alice@gaudon.pro>",

3
src/db/ModelQuery.ts
View File

@ -194,6 +194,7 @@ export default class ModelQuery<M extends Model> implements WhereFieldConsumer<M
public async get(connection?: Connection): Promise<ModelQueryResult<M>> { public async get(connection?: Connection): Promise<ModelQueryResult<M>> {
const queryResult = await this.execute(connection); const queryResult = await this.execute(connection);
const models: ModelQueryResult<M> = []; const models: ModelQueryResult<M> = [];
models.originalData = [];
if (this._pivot) models.pivot = []; if (this._pivot) models.pivot = [];
@ -211,6 +212,7 @@ export default class ModelQuery<M extends Model> implements WhereFieldConsumer<M
const model = this.factory.create(modelData); const model = this.factory.create(modelData);
models.push(model); models.push(model);
models.originalData.push(modelData);
if (this._pivot) { if (this._pivot) {
const pivotData: any = {}; const pivotData: any = {};
@ -267,6 +269,7 @@ export default class ModelQuery<M extends Model> implements WhereFieldConsumer<M
} }
export interface ModelQueryResult<M extends Model> extends Array<M> { export interface ModelQueryResult<M extends Model> extends Array<M> {
originalData?: any[];
pagination?: Pagination<M>; pagination?: Pagination<M>;
pivot?: { [p: string]: any }[]; pivot?: { [p: string]: any }[];
} }