nodart
Advanced tools
Comparing version 5.2.0 to 5.2.1
@@ -32,3 +32,2 @@ import { Knex } from "knex"; | ||
export interface BaseModelInterface { | ||
queryBuilder?: unknown; | ||
orm?: ConnectionManagerInterface; | ||
@@ -35,0 +34,0 @@ |
@@ -5,7 +5,7 @@ import { BaseModelInterface, OrmQueryBuilder } from "./interfaces/orm"; | ||
export abstract class Model implements BaseModelInterface { | ||
queryBuilder: OrmQueryBuilder; | ||
orm: Orm; | ||
get query(): OrmQueryBuilder { | ||
return this.queryBuilder; | ||
return this.orm.queryBuilder; | ||
} | ||
} |
@@ -6,3 +6,3 @@ "use strict"; | ||
get query() { | ||
return this.queryBuilder; | ||
return this.orm.queryBuilder; | ||
} | ||
@@ -9,0 +9,0 @@ } |
@@ -19,6 +19,3 @@ "use strict"; | ||
const model = this.resolve(path ? this.load(path, model_1.Model, rootDir) : type, args); | ||
if (model) { | ||
model.orm || (model.orm = app.service.db.orm); | ||
model.queryBuilder || (model.queryBuilder = model.orm.queryBuilder); | ||
} | ||
model && (model.orm || (model.orm = app.service.db.orm)); | ||
return model; | ||
@@ -25,0 +22,0 @@ } |
@@ -9,6 +9,8 @@ "use strict"; | ||
this.orm = this.loader.call(); | ||
this.query = this.orm.queryBuilder; | ||
} | ||
get query() { | ||
return this.orm.queryBuilder; | ||
} | ||
} | ||
exports.OrmService = OrmService; | ||
//# sourceMappingURL=orm.js.map |
@@ -27,6 +27,3 @@ import { AppLoader } from "../core/app_loader"; | ||
if (model) { | ||
model.orm ||= app.service.db.orm; | ||
model.queryBuilder ||= model.orm.queryBuilder; | ||
} | ||
model && (model.orm ||= app.service.db.orm); | ||
@@ -33,0 +30,0 @@ return model; |
{ | ||
"name": "nodart", | ||
"version": "5.2.0", | ||
"version": "5.2.1", | ||
"description": "A complete framework for creating microservices and large-scale server-side applications for businesses", | ||
@@ -5,0 +5,0 @@ "repository": { |
@@ -9,4 +9,2 @@ import { App } from "../core/app"; | ||
readonly query: OrmQueryBuilder; | ||
readonly loader: OrmLoader; | ||
@@ -17,4 +15,7 @@ | ||
this.orm = this.loader.call(); | ||
this.query = this.orm.queryBuilder; | ||
} | ||
get query(): OrmQueryBuilder { | ||
return this.orm.queryBuilder; | ||
} | ||
} |
@@ -11,3 +11,3 @@ { | ||
"dependencies": { | ||
"nodart": "^5.2.0" | ||
"nodart": "^5.2.1" | ||
}, | ||
@@ -14,0 +14,0 @@ "devDependencies": { |
@@ -12,3 +12,3 @@ { | ||
"dependencies": { | ||
"nodart": "^5.2.0" | ||
"nodart": "^5.2.1" | ||
}, | ||
@@ -15,0 +15,0 @@ "devDependencies": { |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
652172
10871