mythix-orm-sql-base 1.7.3 → 1.8.0

package/lib/sql-connection-base.js

@@ -10,10 +10,14 @@ const {
   Model: ModelBase,
 } = require('mythix-orm');
 
+const SQLQueryGeneratorBase = require('./sql-query-generator-base');
+
 const SAVE_POINT_NAME_CHARS = [ 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P' ];
 const MODEL_RELATIONS       = Symbol.for('_mythixModelRelations');
 
 class SQLConnectionBase extends ConnectionBase {
+  static DefaultQueryGenerator = SQLQueryGeneratorBase;
+
   prepareArrayValuesForSQL(_array) {
     let array = Nife.arrayFlatten(_array);
 
@@ -85,7 +89,17 @@ class SQLConnectionBase extends ConnectionBase {
       return (!parts.length) ? null : parts.join(',');
     };
 
-    let context         = queryEngine._getRawQueryContext();
+    const isEmptyModel = (model) => {
+      if (!model)
+        return true;
+
+      if (model._mythixIsEmpty === false)
+        return false;
+
+      return true;
+    };
+
+    let context         = queryEngine.getOperationContext();
     let fields          = this.findAllFieldsFromFieldProjectionMap(columns);
     let rootModelName   = context.rootModelName;
     let modelData       = {};
@@ -140,16 +154,31 @@ class SQLConnectionBase extends ConnectionBase {
         if (!dataContext)
           dataContext = data[modelName] = {};
 
+        // Track empty models (can happen for left or right table joins)
+        if (remoteValue != null && !Object.prototype.hasOwnProperty.call(dataContext, '_mythixIsEmpty')) {
+          Object.defineProperties(dataContext, {
+            '_mythixIsEmpty': {
+              writable:     true,
+              enumerable:   false,
+              configurable: true,
+              value:        false,
+            },
+          });
+        }
+
         dataContext[field.fieldName] = remoteValue;
       }
 
       let rootModel;
       for (let j = 0, jl = modelNames.length; j < jl; j++) {
-        let modelName     = modelNames[j];
-        let info          = modelInfo[modelName];
-        let models        = modelData[modelName];
-        let model         = data[modelName];
-        let pkFieldName   = info.pkFieldName;
+        let modelName = modelNames[j];
+        let model     = data[modelName];
+        if (isEmptyModel(model))
+          continue;
+
+        let info        = modelInfo[modelName];
+        let models      = modelData[modelName];
+        let pkFieldName = info.pkFieldName;
         let index;
 
         if (!models)
@@ -209,7 +238,7 @@ class SQLConnectionBase extends ConnectionBase {
     if (Nife.isEmpty(modelDataMap))
       return [];
 
-    let queryContext  = queryEngine._getRawQueryContext();
+    let queryContext  = queryEngine.getOperationContext();
     let rootModelName = queryContext.rootModelName;
     let RootModel     = queryContext.rootModel;
     if (!rootModelName || !RootModel)
@@ -373,6 +402,7 @@ class SQLConnectionBase extends ConnectionBase {
             throw new Error(`${this.constructor.name}::update: Model's primary key is empty. Models being updated must have a valid primary key.`);
 
           query = query[primaryKeyFieldName].EQ(pkFieldValue);
+          query = await this.finalizeQuery('update', query, options);
 
           let sqlStr = queryGenerator.generateUpdateStatement(Model, model, query, options);
           if (!sqlStr)
@@ -394,11 +424,13 @@ class SQLConnectionBase extends ConnectionBase {
     if (!queryEngine)
       throw new Error(`${this.constructor.name}::updateAll: Model class or query is required to update.`);
 
-    let rootModel = queryEngine._getRawQueryContext().rootModel;
+    let options = Object.assign({}, _options || {}, { isUpdateOperation: true });
+    queryEngine = await this.finalizeQuery('update', queryEngine, options);
+
+    let rootModel = queryEngine.getOperationContext().rootModel;
     if (!rootModel)
       throw new Error(`${this.constructor.name}::updateAll: Root model not found, and is required to update.`);
 
-    let options         = Object.assign({}, _options || {}, { isUpdateOperation: true });
     let queryGenerator  = this.getQueryGenerator();
     let sqlStr          = queryGenerator.generateUpdateStatement(rootModel, model, queryEngine, options);
 
@@ -416,8 +448,9 @@ class SQLConnectionBase extends ConnectionBase {
       if (options.truncate !== true)
         return;
 
+      let query           = await this.finalizeQuery('delete', Model.where(this).unscoped(), options);
       let queryGenerator  = this.getQueryGenerator();
-      let sqlStr          = queryGenerator.generateDeleteStatement(Model, Model.where(this).unscoped(), options);
+      let sqlStr          = queryGenerator.generateDeleteStatement(Model, query, options);
 
       return await this.query(sqlStr, options);
     }
@@ -453,7 +486,8 @@ class SQLConnectionBase extends ConnectionBase {
         if (Nife.isEmpty(pkIDs))
           return;
 
-        let sqlStr = queryGenerator.generateDeleteStatement(Model, Model.where(this).id.EQ(pkIDs));
+        let query   = await this.finalizeQuery('delete', Model.where(this).id.EQ(pkIDs), options);
+        let sqlStr = queryGenerator.generateDeleteStatement(Model, query);
         if (!sqlStr)
           return;
 
@@ -478,11 +512,13 @@ class SQLConnectionBase extends ConnectionBase {
     if (!queryEngine)
       throw new Error(`${this.constructor.name}::destroy: Model class or query is required to destroy.`);
 
-    let rootModel = queryEngine._getRawQueryContext().rootModel;
+    let options = modelsOrOptions || {};
+    queryEngine = await this.finalizeQuery('delete', queryEngine, options);
+
+    let rootModel = queryEngine.getOperationContext().rootModel;
     if (!rootModel)
       throw new Error(`${this.constructor.name}::destroy: Root model not found, and is required to destroy.`);
 
-    let options         = modelsOrOptions || {};
     let queryGenerator  = this.getQueryGenerator();
     let sqlStr          = queryGenerator.generateDeleteStatement(rootModel, queryEngine, options);
     return await this.query(sqlStr, options);
@@ -500,8 +536,10 @@ class SQLConnectionBase extends ConnectionBase {
         throw new TypeError(`${this.constructor.name}::select: First argument must be a model class or a query.`);
     }
 
-    let queryContext    = queryEngine._getRawQueryContext();
-    let options         = _options || {};
+    let options = _options || {};
+    queryEngine = await this.finalizeQuery('read', queryEngine, options);
+
+    let queryContext    = queryEngine.getOperationContext();
     let batchSize       = options.batchSize || 500;
     let startIndex      = queryContext.offset || 0;
     let queryGenerator  = this.getQueryGenerator();
@@ -549,9 +587,10 @@ class SQLConnectionBase extends ConnectionBase {
     if (!queryEngine)
       throw new TypeError(`${this.constructor.name}::aggregate: First argument must be a model class or a query.`);
 
+    queryEngine = await this.finalizeQuery('read', queryEngine, options);
     queryEngine = queryEngine.clone();
 
-    let queryContext  = queryEngine._getRawQueryContext();
+    let queryContext  = queryEngine.getOperationContext();
     let distinct      = queryContext.distinct;
     if (distinct) {
       let fullyQualifiedFieldName = distinct.getFullyQualifiedFieldName();
@@ -586,7 +625,7 @@ class SQLConnectionBase extends ConnectionBase {
     if (!queryEngine)
       throw new TypeError(`${this.constructor.name}::average: First argument must be a model class or a query.`);
 
-    let rootModel = queryEngine._getRawQueryContext().rootModel;
+    let rootModel = queryEngine.getOperationContext().rootModel;
     let field     = Utils.fieldToFullyQualifiedName(_field, rootModel);
 
     return await this.aggregate(queryEngine, new Literals.AverageLiteral(field), options);
@@ -597,7 +636,9 @@ class SQLConnectionBase extends ConnectionBase {
     if (!queryEngine)
       throw new TypeError(`${this.constructor.name}::count: First argument must be a model class or a query.`);
 
-    let rootModel = queryEngine._getRawQueryContext().rootModel;
+    queryEngine = await this.finalizeQuery('read', queryEngine, options);
+
+    let rootModel = queryEngine.getOperationContext().rootModel;
     let field     = (_field) ? Utils.fieldToFullyQualifiedName(_field, rootModel) : null;
 
     return await this.aggregate(queryEngine, new Literals.CountLiteral(field), options);
@@ -608,7 +649,9 @@ class SQLConnectionBase extends ConnectionBase {
     if (!queryEngine)
       throw new TypeError(`${this.constructor.name}::min: First argument must be a model class or a query.`);
 
-    let rootModel = queryEngine._getRawQueryContext().rootModel;
+    queryEngine = await this.finalizeQuery('read', queryEngine, options);
+
+    let rootModel = queryEngine.getOperationContext().rootModel;
     let field     = Utils.fieldToFullyQualifiedName(_field, rootModel);
 
     return await this.aggregate(queryEngine, new Literals.MinLiteral(field), options);
@@ -619,7 +662,9 @@ class SQLConnectionBase extends ConnectionBase {
     if (!queryEngine)
       throw new TypeError(`${this.constructor.name}::max: First argument must be a model class or a query.`);
 
-    let rootModel = queryEngine._getRawQueryContext().rootModel;
+    queryEngine = await this.finalizeQuery('read', queryEngine, options);
+
+    let rootModel = queryEngine.getOperationContext().rootModel;
     let field     = Utils.fieldToFullyQualifiedName(_field, rootModel);
 
     return await this.aggregate(queryEngine, new Literals.MaxLiteral(field), options);
@@ -630,7 +675,9 @@ class SQLConnectionBase extends ConnectionBase {
     if (!queryEngine)
       throw new TypeError(`${this.constructor.name}::sum: First argument must be a model class or a query.`);
 
-    let rootModel = queryEngine._getRawQueryContext().rootModel;
+    queryEngine = await this.finalizeQuery('read', queryEngine, options);
+
+    let rootModel = queryEngine.getOperationContext().rootModel;
     let field     = Utils.fieldToFullyQualifiedName(_field, rootModel);
 
     return await this.aggregate(queryEngine, new Literals.SumLiteral(field), options);
@@ -658,7 +705,9 @@ class SQLConnectionBase extends ConnectionBase {
         throw new TypeError(`${this.constructor.name}::pluck: First argument must be a model class or a query.`);
     }
 
-    let queryContext  = queryEngine._getRawQueryContext();
+    queryEngine = await this.finalizeQuery('read', queryEngine, options);
+
+    let queryContext  = queryEngine.getOperationContext();
     let rootModel     = queryContext.rootModel;
     let rootModelName = rootModel.getModelName();
 

package/lib/sql-query-generator-base.js

@@ -227,7 +227,7 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
     let sqlOperator       = this.generateSelectQueryOperatorFromQueryEngineOperator(queryPart, operator, value, false, options);
 
     if (QueryEngine.isQuery(value)) {
-      if (!value._queryHasConditions())
+      if (!value.queryHasConditions())
         return '';
 
       if (sqlOperator === '=')
@@ -339,7 +339,7 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
       items.push(joinInfo);
     };
 
-    let query = queryEngine._getRawQuery();
+    let query = queryEngine.getOperationStack();
     let joins = new Map();
 
     for (let i = 0, il = query.length; i < il; i++) {
@@ -353,11 +353,11 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
 
       // If the query has a condition, then it is a sub-query
       // not a join
-      if (operatorValue._getRawQueryContext().condition)
+      if (operatorValue.getOperationContext().condition)
         continue;
 
       let joinType = this.generateSQLJoinTypeFromQueryEngineJoinType(queryPart.joinType, queryPart.joinOuter, options);
-      let joinInfo = this.getJoinTableInfoFromQueryContexts(queryPart, operatorValue._getRawQueryContext(), joinType, options);
+      let joinInfo = this.getJoinTableInfoFromQueryContexts(queryPart, operatorValue.getOperationContext(), joinType, options);
 
       addToJoins(joinInfo);
     }
@@ -391,7 +391,7 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
       return '';
     };
 
-    let query     = queryEngine._getRawQuery();
+    let query     = queryEngine.getOperationStack();
     let sqlParts  = [];
     let hasValue  = false;
 
@@ -590,7 +590,7 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
     if (options.includeRelations === true)
       queryEngine = queryEngine.clone().PROJECT('*');
 
-    let rootModel = queryEngine._getRawQueryContext().rootModel;
+    let rootModel = queryEngine.getOperationContext().rootModel;
     if (!rootModel)
       throw new Error(`${this.constructor.name}::generateSelectStatement: No root model found.`);
 
@@ -1138,8 +1138,8 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
     }
 
     let escapedTableName = this.getEscapedTableName(Model, options);
-    if (queryEngine && queryEngine._queryHasConditions()) {
-      if (queryEngine._queryHasJoins()) {
+    if (queryEngine && queryEngine.queryHasConditions()) {
+      if (queryEngine.queryHasJoins()) {
         let pkField = Model.getPrimaryKeyField();
         if (!pkField)
           throw new Error(`${this.constructor.name}::generateDeleteStatement: Can not delete using table joins on a table with no primary key field.`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix-orm-sql-base",
-  "version": "1.7.3",
+  "version": "1.8.0",
   "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.8.3"
+    "mythix-orm": "^1.10.2"
   },
   "dependencies": {
     "luxon": "^3.1.0",