mythix-orm 1.4.5 → 1.4.6

package/lib/connection/connection-base.js

@@ -230,10 +230,10 @@ class ConnectionBase extends EventEmitter {
     return SqlString.escape(value);
   }
 
-  escape(field, _value) {
+  escape(field, _value, options) {
     var value = _value;
     if (LiteralBase.isLiteral(value))
-      return value.toString(this);
+      return value.toString(this, options);
 
     value = field.type.serialize(value, this);
 
@@ -259,14 +259,14 @@ class ConnectionBase extends EventEmitter {
     return parts.map((part) => SqlString.escapeId(part).replace(/^`/, '"').replace(/`$/, '"')).join('.');
   }
 
-  escapeID(value) {
+  escapeID(value, options) {
     if (LiteralBase.isLiteral(value))
-      return value.toString(this.connection);
+      return value.toString(this.connection, options);
 
     return this._escapeID(value);
   }
 
-  _averageLiteralToString(literal) {
+  _averageLiteralToString(literal, options) {
     if (!literal || !LiteralBase.isLiteral(literal))
       return;
 
@@ -274,10 +274,10 @@ class ConnectionBase extends EventEmitter {
     if (!queryGenerator)
       return;
 
-    return queryGenerator._averageLiteralToString(literal);
+    return queryGenerator._averageLiteralToString(literal, options);
   }
 
-  _countLiteralToString(literal) {
+  _countLiteralToString(literal, options) {
     if (!literal || !LiteralBase.isLiteral(literal))
       return;
 
@@ -285,10 +285,10 @@ class ConnectionBase extends EventEmitter {
     if (!queryGenerator)
       return;
 
-    return queryGenerator._countLiteralToString(literal);
+    return queryGenerator._countLiteralToString(literal, options);
   }
 
-  _distinctLiteralToString(literal) {
+  _distinctLiteralToString(literal, options) {
     if (!literal || !LiteralBase.isLiteral(literal))
       return;
 
@@ -296,10 +296,10 @@ class ConnectionBase extends EventEmitter {
     if (!queryGenerator)
       return;
 
-    return queryGenerator._distinctLiteralToString(literal);
+    return queryGenerator._distinctLiteralToString(literal, options);
   }
 
-  _maxLiteralToString(literal) {
+  _maxLiteralToString(literal, options) {
     if (!literal || !LiteralBase.isLiteral(literal))
       return;
 
@@ -307,10 +307,10 @@ class ConnectionBase extends EventEmitter {
     if (!queryGenerator)
       return;
 
-    return queryGenerator._maxLiteralToString(literal);
+    return queryGenerator._maxLiteralToString(literal, options);
   }
 
-  _minLiteralToString(literal) {
+  _minLiteralToString(literal, options) {
     if (!literal || !LiteralBase.isLiteral(literal))
       return;
 
@@ -318,10 +318,10 @@ class ConnectionBase extends EventEmitter {
     if (!queryGenerator)
       return;
 
-    return queryGenerator._minLiteralToString(literal);
+    return queryGenerator._minLiteralToString(literal, options);
   }
 
-  _sumLiteralToString(literal) {
+  _sumLiteralToString(literal, options) {
     if (!literal || !LiteralBase.isLiteral(literal))
       return;
 
@@ -329,24 +329,24 @@ class ConnectionBase extends EventEmitter {
     if (!queryGenerator)
       return;
 
-    return queryGenerator._sumLiteralToString(literal);
+    return queryGenerator._sumLiteralToString(literal, options);
   }
 
-  literalToString(literal) {
+  literalToString(literal, options) {
     if (Literals.AverageLiteral.isLiteralType(literal))
-      return this._averageLiteralToString(literal);
+      return this._averageLiteralToString(literal, options);
     else if (Literals.CountLiteral.isLiteralType(literal))
-      return this._countLiteralToString(literal);
+      return this._countLiteralToString(literal, options);
     else if (Literals.DistinctLiteral.isLiteralType(literal))
-      return this._distinctLiteralToString(literal);
+      return this._distinctLiteralToString(literal, options);
     else if (Literals.MaxLiteral.isLiteralType(literal))
-      return this._maxLiteralToString(literal);
+      return this._maxLiteralToString(literal, options);
     else if (Literals.MinLiteral.isLiteralType(literal))
-      return this._minLiteralToString(literal);
+      return this._minLiteralToString(literal, options);
     else if (Literals.SumLiteral.isLiteralType(literal))
-      return this._sumLiteralToString(literal);
+      return this._sumLiteralToString(literal, options);
     else if (Literals.Literal.isLiteralType(literal))
-      return literal.toString(this);
+      return literal.toString(this, options);
 
     throw new Error(`${this.constructor.name}::literalToString: Unsupported literal ${literal}.`);
   }

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

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

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

@@ -7,11 +7,11 @@ class CountLiteral extends LiteralFieldBase {
     return false;
   }
 
-  toString(connection) {
+  toString(connection, options) {
     if (!connection)
       return `${this.constructor.name} {}`;
 
-    return connection.literalToString(this);
+    return connection.literalToString(this, options);
   }
 }
 

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

@@ -3,11 +3,11 @@
 const LiteralFieldBase = require('./literal-field-base');
 
 class DistinctLiteral extends LiteralFieldBase {
-  toString(connection) {
+  toString(connection, options) {
     if (!connection)
       return `${this.constructor.name} {}`;
 
-    return connection.literalToString(this);
+    return connection.literalToString(this, options);
   }
 }
 

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

@@ -40,6 +40,13 @@ class LiteralFieldBase extends LiteralBase {
 
     return `${definition.modelName}:${definition.fieldNames[0]}`;
   }
+
+  getField(connection) {
+    if (!this.definition)
+      return null;
+
+    return this.definitionToField(connection, this.definition);
+  }
 }
 
 module.exports = LiteralFieldBase;

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

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

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

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

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

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

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

@@ -20,10 +20,12 @@ class QueryGeneratorBase {
     });
   }
 
-  stackAssign(obj, ...args) {
+  stackAssign(obj, ..._args) {
     let newObj = Object.create(obj || {});
+    let args = _args.filter(Boolean);
 
-    Object.assign(newObj, ...args);
+    if (args.length > 0)
+      Object.assign(newObj, ...args);
 
     return newObj;
   }
@@ -159,8 +161,14 @@ class QueryGeneratorBase {
         continue;
 
       if (LiteralBase.isLiteral(field)) {
-        let result          = field.toString(this.connection);
-        let projectionField = this.parseFieldProjection(result, true);
+        let result          = field.toString(this.connection, options);
+        let projectionField;
+
+        if (typeof field.getField === 'function')
+          projectionField = field.getField(this.connection);
+        else
+          projectionField = this.parseFieldProjection(result, true);
+
         if (projectionField === result) {
           // not able to parse projection
           continue;
@@ -188,7 +196,7 @@ class QueryGeneratorBase {
     return orderFieldMap;
   }
 
-  sortedProjectedFields(projectedFields) {
+  sortedProjectedFields(projectedFields, options) {
     return projectedFields.sort((a, b) => {
       // If either value is a distinct literal
       // then make certain it comes first in
@@ -197,8 +205,8 @@ class QueryGeneratorBase {
       const distinctSortOrder = (a, b) => {
         let x           = LiteralBase.isLiteral(a);
         let y           = LiteralBase.isLiteral(b);
-        let xStr        = (x) ? a.toString(this.connection) : a;
-        let yStr        = (y) ? b.toString(this.connection) : b;
+        let xStr        = (x) ? a.toString(this.connection, options) : a;
+        let yStr        = (y) ? b.toString(this.connection, options) : b;
         let xIsDistinct = (typeof xStr === 'string' && LITERAL_IS_DISTINCT_RE.test(xStr));
         let yIsDistinct = (typeof yStr === 'string' && LITERAL_IS_DISTINCT_RE.test(yStr));
 
@@ -383,7 +391,7 @@ class QueryGeneratorBase {
         result = Array.from(projectedFields.values());
 
         // Convert projection fields to array and sort
-        result = this.sortedProjectedFields(result);
+        result = this.sortedProjectedFields(result, options);
 
         // Now prefix the projection fields with the distinct
         // literal if one exists on the query
@@ -442,7 +450,7 @@ class QueryGeneratorBase {
         if (hasDistinct && Literals.DistinctLiteral.isLiteralType(projectionValue))
           continue;
 
-        let key = projectionValue.toString(this.connection);
+        let key = projectionValue.toString(this.connection, options);
         if (isAdding)
           projectedFields.set(key, projectionValue);
         else
@@ -556,8 +564,13 @@ class QueryGeneratorBase {
     return result;
   }
 
+  isFieldIdentifier(str) {
+    return (/^"[^"]+"."[^"]+"|"\w+:[\w.]+"/i).test(str);
+  }
+
   getProjectedFields(queryEngine, _options, asMap) {
-    let queryProjection     = this.getProjectionFromQueryEngine(queryEngine, _options);
+    let options             = _options || {};
+    let queryProjection     = this.getProjectionFromQueryEngine(queryEngine, options);
     let allProjectionFields = new Map();
 
     for (let i = 0, il = queryProjection.length; i < il; i++) {
@@ -566,15 +579,20 @@ class QueryGeneratorBase {
         continue;
 
       if (LiteralBase.isLiteral(projectionField)) {
-        let result = projectionField.toString(this.connection);
-        let fullFieldName = this.parseFieldProjection(result);
+        let result = projectionField.toString(this.connection, options);
+        let fullFieldName;
+
+        if (typeof projectionField.getFullyQualifiedFieldName === 'function')
+          fullFieldName = projectionField.getFullyQualifiedFieldName();
+        else
+          fullFieldName = this.parseFieldProjection(result);
+
         if (!fullFieldName)
           fullFieldName = result;
 
         if (fullFieldName && result)
           allProjectionFields.set(fullFieldName, result);
-
-        if (result && !this.isFieldProjection(result))
+        else
           allProjectionFields.set(result, result);
 
         continue;
@@ -773,33 +791,33 @@ class QueryGeneratorBase {
     return queryRoot.slice(index);
   }
 
-  _averageLiteralToString(literal) {
+  _averageLiteralToString(literal, options) {
     if (!literal || !LiteralBase.isLiteral(literal))
       return;
 
-    let field = literal.definitionToField(this.connection, literal.definition);
+    let field = literal.getField(this.connection);
     let escapedFieldName;
 
     if (LiteralBase.isLiteral(field))
-      escapedFieldName = field.toString(this.connection);
+      escapedFieldName = field.toString(this.connection, options);
     else
-      escapedFieldName = this.getEscapedColumnName(field.Model, field, literal.options);
+      escapedFieldName = this.getEscapedColumnName(field.Model, field, this.stackAssign(options, literal.options));
 
     return `AVG(${escapedFieldName})`;
   }
 
-  _countLiteralToString(literal) {
+  _countLiteralToString(literal, options) {
     if (!literal || !LiteralBase.isLiteral(literal))
       return;
 
-    let field = (literal.definition) ? literal.definitionToField(this.connection, literal.definition) : null;
+    let field = literal.getField(this.connection);
     let escapedFieldName;
 
     if (field) {
       if (LiteralBase.isLiteral(field))
-        escapedFieldName = field.toString(this.connection);
+        escapedFieldName = field.toString(this.connection, options);
       else
-        escapedFieldName = this.getEscapedColumnName(field.Model, field, literal.options);
+        escapedFieldName = this.getEscapedColumnName(field.Model, field, this.stackAssign(options, literal.options));
     } else {
       escapedFieldName = '*';
     }
@@ -807,58 +825,58 @@ class QueryGeneratorBase {
     return `COUNT(${escapedFieldName})`;
   }
 
-  _distinctLiteralToString(literal) {
+  _distinctLiteralToString(literal, options) {
     if (!literal || !LiteralBase.isLiteral(literal))
       return;
 
-    let field = literal.definitionToField(this.connection, literal.definition);
+    let field = literal.getField(this.connection);
     if (LiteralBase.isLiteral(field))
-      return `DISTINCT ${field.toString(this.connection)}`;
+      return `DISTINCT ${field.toString(this.connection, options)}`;
 
-    return `DISTINCT ${this.getEscapedProjectionName(field.Model, field, literal.options)}`;
+    return `DISTINCT ${this.getEscapedProjectionName(field.Model, field, this.stackAssign(options, literal.options))}`;
   }
 
-  _maxLiteralToString(literal) {
+  _maxLiteralToString(literal, options) {
     if (!literal || !LiteralBase.isLiteral(literal))
       return;
 
-    let field = literal.definitionToField(this.connection, literal.definition);
+    let field = literal.getField(this.connection);
     let escapedFieldName;
 
     if (LiteralBase.isLiteral(field))
-      escapedFieldName = field.toString(this.connection);
+      escapedFieldName = field.toString(this.connection, options);
     else
-      escapedFieldName = this.getEscapedColumnName(field.Model, field, literal.options);
+      escapedFieldName = this.getEscapedColumnName(field.Model, field, this.stackAssign(options, literal.options));
 
     return `MAX(${escapedFieldName})`;
   }
 
-  _minLiteralToString(literal) {
+  _minLiteralToString(literal, options) {
     if (!literal || !LiteralBase.isLiteral(literal))
       return;
 
-    let field = literal.definitionToField(this.connection, literal.definition);
+    let field = literal.getField(this.connection);
     let escapedFieldName;
 
     if (LiteralBase.isLiteral(field))
-      escapedFieldName = field.toString(this.connection);
+      escapedFieldName = field.toString(this.connection, options);
     else
-      escapedFieldName = this.getEscapedColumnName(field.Model, field, literal.options);
+      escapedFieldName = this.getEscapedColumnName(field.Model, field, this.stackAssign(options, literal.options));
 
     return `MIN(${escapedFieldName})`;
   }
 
-  _sumLiteralToString(literal) {
+  _sumLiteralToString(literal, options) {
     if (!literal || !LiteralBase.isLiteral(literal))
       return;
 
-    let field = literal.definitionToField(this.connection, literal.definition);
+    let field = literal.getField(this.connection);
     let escapedFieldName;
 
     if (LiteralBase.isLiteral(field))
-      escapedFieldName = field.toString(this.connection);
+      escapedFieldName = field.toString(this.connection, options);
     else
-      escapedFieldName = this.getEscapedColumnName(field.Model, field, literal.options);
+      escapedFieldName = this.getEscapedColumnName(field.Model, field, this.stackAssign(options, literal.options));
 
     return `SUM(${escapedFieldName})`;
   }

package/package.json

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