mythix-orm-sql-base 1.6.3 → 1.7.1

package/lib/sql-connection-base.js

@@ -366,7 +366,7 @@ class SQLConnectionBase extends ConnectionBase {
         let models = preparedModels.models;
         for (let i = 0, il = models.length; i < il; i++) {
           let model = models[i];
-          let query = Model.where;
+          let query = Model.where(this);
 
           let pkFieldValue = model[primaryKeyFieldName];
           if (!pkFieldValue)
@@ -414,7 +414,7 @@ class SQLConnectionBase extends ConnectionBase {
     let options = _options || {};
     if (_models == null) {
       let queryGenerator  = this.getQueryGenerator();
-      let sqlStr          = queryGenerator.generateDeleteStatement(Model, Model.where.unscoped(), options);
+      let sqlStr          = queryGenerator.generateDeleteStatement(Model, Model.where(this).unscoped(), options);
 
       return await this.query(sqlStr, options);
     }
@@ -450,7 +450,7 @@ class SQLConnectionBase extends ConnectionBase {
         if (Nife.isEmpty(pkIDs))
           return;
 
-        let sqlStr = queryGenerator.generateDeleteStatement(Model, Model.where.id.EQ(pkIDs));
+        let sqlStr = queryGenerator.generateDeleteStatement(Model, Model.where(this).id.EQ(pkIDs));
         if (!sqlStr)
           return;
 
@@ -491,7 +491,7 @@ class SQLConnectionBase extends ConnectionBase {
       throw new TypeError(`${this.constructor.name}::select: First argument must be a model class or a query.`);
 
     if (!QueryEngine.isQuery(queryEngine)) {
-      if (Object.prototype.hasOwnProperty.call(queryEngine, 'where'))
+      if ('where' in queryEngine)
         queryEngine = queryEngine.where(this);
       else
         throw new TypeError(`${this.constructor.name}::select: First argument must be a model class or a query.`);
@@ -563,7 +563,7 @@ class SQLConnectionBase extends ConnectionBase {
 
     let literalStr      = literal.toString(this);
     let queryGenerator  = this.getQueryGenerator();
-    let query           = queryEngine.PROJECT(literal);
+    let query           = queryEngine.PROJECT(literal).ORDER(); // TODO: Remove ORDER here once aggregate ORDER BY is fixed
     let sqlStr          = queryGenerator.generateSelectStatement(query, options);
 
     let result      = await this.query(sqlStr, options);
@@ -649,7 +649,7 @@ class SQLConnectionBase extends ConnectionBase {
       throw new TypeError(`${this.constructor.name}::pluck: First argument must be a model class or a query.`);
 
     if (!QueryEngine.isQuery(queryEngine)) {
-      if (Object.prototype.hasOwnProperty.call(queryEngine, 'where'))
+      if ('where' in queryEngine)
         queryEngine = queryEngine.where(this);
       else
         throw new TypeError(`${this.constructor.name}::pluck: First argument must be a model class or a query.`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix-orm-sql-base",
-  "version": "1.6.3",
+  "version": "1.7.1",
   "description": "SQL base support for Mythix ORM",
   "main": "lib/index",
   "type": "commonjs",
@@ -33,7 +33,7 @@
   },
   "homepage": "https://github.com/th317erd/mythix-orm-sql-base#readme",
   "peerDependencies": {
-    "mythix-orm": "^1.7.2"
+    "mythix-orm": "^1.8.1"
   },
   "dependencies": {
     "luxon": "^3.0.4",