mythix-orm 1.11.4 → 1.11.6

package/lib/connection/connection-base.js

@@ -280,6 +280,16 @@ class ConnectionBase extends EventEmitter {
     return new QueryGeneratorBase(this);
   }
 
+  stackAssign(obj, ..._args) {
+    let newObj = Object.create(obj || {});
+    let args = _args.filter(Boolean);
+
+    if (args.length > 0)
+      Object.assign(newObj, ...args);
+
+    return newObj;
+  }
+
   /// This method is an internal method that parses
   /// the "lock mode" options passed to a call to
   /// <see>Connection.transaction</see>.

package/lib/connection/literals/average-literal.js

@@ -3,6 +3,10 @@
 const LiteralFieldBase = require('./literal-field-base');
 
 class AverageLiteral extends LiteralFieldBase {
+  static isAggregate() {
+    return true;
+  }
+
   toString(connection, options) {
     if (!connection)
       return `${this.constructor.name} {}`;

package/lib/connection/literals/count-literal.js

@@ -7,6 +7,10 @@ class CountLiteral extends LiteralFieldBase {
     return false;
   }
 
+  static isAggregate() {
+    return true;
+  }
+
   toString(connection, options) {
     if (!connection)
       return `${this.constructor.name} {}`;

package/lib/connection/literals/literal-base.js

@@ -43,6 +43,14 @@ class LiteralBase {
     return (this.isLiteral(value) && value.constructor && value.constructor.name === this.name);
   }
 
+  static isAggregate() {
+    return false;
+  }
+
+  isAggregate() {
+    return this.constructor.isAggregate();
+  }
+
   constructor(literal, options) {
     Object.defineProperties(this, {
       'literal': {
@@ -87,6 +95,9 @@ class LiteralBase {
     if (LiteralBase.isLiteral(definition))
       return definition;
 
+    if (!definition.fieldNames)
+      return definition;
+
     let field = connection.getField(definition.fieldNames[0], definition.modelName);
     if (!field) {
       if (definition.fieldNames[0] && definition.modelName) {
@@ -109,6 +120,10 @@ class LiteralBase {
   toString() {
     return this.literal;
   }
+
+  valueOf() {
+    return this.literal;
+  }
 }
 
 module.exports = LiteralBase;

package/lib/connection/literals/literal-field-base.js

@@ -20,6 +20,8 @@ class LiteralFieldBase extends LiteralBase {
       } catch (error) {
         if (isRequired)
           throw error;
+
+        definition = fullyQualifiedName;
       }
     }
 
@@ -47,6 +49,10 @@ class LiteralFieldBase extends LiteralBase {
 
     return this.definitionToField(connection, this.definition);
   }
+
+  valueOf() {
+    return this.definition;
+  }
 }
 
 module.exports = LiteralFieldBase;

package/lib/connection/literals/max-literal.js

@@ -3,6 +3,10 @@
 const LiteralFieldBase = require('./literal-field-base');
 
 class MaxLiteral extends LiteralFieldBase {
+  static isAggregate() {
+    return true;
+  }
+
   toString(connection, options) {
     if (!connection)
       return `${this.constructor.name} {}`;

package/lib/connection/literals/min-literal.js

@@ -3,6 +3,10 @@
 const LiteralFieldBase = require('./literal-field-base');
 
 class MinLiteral extends LiteralFieldBase {
+  static isAggregate() {
+    return true;
+  }
+
   toString(connection, options) {
     if (!connection)
       return `${this.constructor.name} {}`;

package/lib/connection/literals/sum-literal.js

@@ -3,6 +3,10 @@
 const LiteralFieldBase = require('./literal-field-base');
 
 class SumLiteral extends LiteralFieldBase {
+  static isAggregate() {
+    return true;
+  }
+
   toString(connection, options) {
     if (!connection)
       return `${this.constructor.name} {}`;

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

@@ -15,14 +15,8 @@ class QueryGeneratorBase {
     });
   }
 
-  stackAssign(obj, ..._args) {
-    let newObj = Object.create(obj || {});
-    let args = _args.filter(Boolean);
-
-    if (args.length > 0)
-      Object.assign(newObj, ...args);
-
-    return newObj;
+  stackAssign(obj, ...args) {
+    return this.connection.stackAssign(obj, ...args);
   }
 
   escape(...args) {

package/lib/model.js

@@ -450,14 +450,16 @@ class Model {
   ///   a connection to your models. This will allow you to provide a
   ///   connection directly when you create the model, which can make
   ///   interacting with the model less tiresome. i.e. `new Model(null, { connection })`.
-  _getConnection(connection) {
+  _getConnection(_connection) {
+    let connection = _connection;
     if (connection)
       return connection;
 
-    if (this._connection)
-      return this._connection;
+    connection = this.constructor._getConnection();
+    if (connection)
+      return connection;
 
-    return this.constructor._getConnection();
+    return this._connection;
   }
 
   static getConnection(_connection) {

package/lib/query-engine/model-scope.js

@@ -353,6 +353,8 @@ class ModelScope extends QueryEngineBase {
       distinctValue = new DistinctLiteral(`${fullyQualifiedName.Model.getModelName()}:${fullyQualifiedName.fieldName}`);
     } else if (LiteralBase.isLiteral(fullyQualifiedName)) {
       distinctValue = new DistinctLiteral(fullyQualifiedName);
+    } else if (!fullyQualifiedName) {
+      distinctValue = null;
     } else {
       throw new TypeError(`QueryEngine::ModelScope::DISTINCT: Invalid value provided [${(fullyQualifiedName) ? fullyQualifiedName.toString() : fullyQualifiedName}]. All values provided must be strings, fields, or literals.`);
     }

package/lib/utils/async-store.js

@@ -1,15 +1,17 @@
 'use strict';
 
-let globalAsyncStore;
-
-try {
-  const { AsyncLocalStorage } = require('async_hooks');
-  globalAsyncStore = new AsyncLocalStorage();
-} catch (error) {
-  globalAsyncStore = {
-    getStore: () => undefined,
-    run:      (context, callback) => callback(),
-  };
+let globalAsyncStore = global._mythixGlobalAsyncLocalStore;
+
+if (!globalAsyncStore) {
+  try {
+    const { AsyncLocalStorage } = require('async_hooks');
+    global._mythixGlobalAsyncLocalStore = globalAsyncStore = new AsyncLocalStorage();
+  } catch (error) {
+    global._mythixGlobalAsyncLocalStore = globalAsyncStore = {
+      getStore: () => undefined,
+      run:      (context, callback) => callback(),
+    };
+  }
 }
 
 function getContextStore() {
@@ -40,16 +42,13 @@ function setContextValue(key, value) {
 }
 
 function runInContext(context, callback) {
-  return new Promise((resolve, reject) => {
-    globalAsyncStore.run({ parent: globalAsyncStore.getStore(), context }, async () => {
-      try {
-        let result = await callback();
-        resolve(result);
-      } catch (error) {
-        reject(error);
-      }
-    });
-  });
+  return globalAsyncStore.run(
+    {
+      parent: globalAsyncStore.getStore(),
+      context,
+    },
+    callback,
+  );
 }
 
 module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix-orm",
-  "version": "1.11.4",
+  "version": "1.11.6",
   "description": "ORM for Mythix framework",
   "main": "lib/index",
   "type": "commonjs",