mythix-orm-sql-base 1.9.4 → 1.9.6

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

@@ -194,6 +194,12 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
   }
 
   _getLiteralAlias(literal, options) {
+    if (options && options.isSubField)
+      return '';
+
+    if (options && options.noProjectionAliases)
+      return '';
+
     let as = (literal.options && literal.options.as) || (options && options.as);
     if (Nife.isEmpty(as))
       return '';
@@ -206,14 +212,14 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
       return;
 
     let field = literal.getField(this.connection);
-    let escapedFieldName;
+    let escapedColumnName;
 
     if (LiteralBase.isLiteral(field))
-      escapedFieldName = field.toString(this.connection, options);
+      escapedColumnName = field.toString(this.connection, this.stackAssign(options, { isSubField: true }));
     else
-      escapedFieldName = this.getEscapedColumnName(field.Model, field, this.stackAssign(options, literal.options));
+      escapedColumnName = this.getEscapedColumnName(field.Model, field, this.stackAssign(options, literal.options));
 
-    return `AVG(${escapedFieldName})${this._getLiteralAlias(literal, options)}`;
+    return `AVG(${escapedColumnName})${this._getLiteralAlias(literal, options)}`;
   }
 
   _countLiteralToString(literal, options) {
@@ -221,18 +227,18 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
       return;
 
     let field = literal.getField(this.connection);
-    let escapedFieldName;
+    let escapedColumnName;
 
     if (field) {
       if (LiteralBase.isLiteral(field))
-        escapedFieldName = field.toString(this.connection, options);
+        escapedColumnName = field.toString(this.connection, this.stackAssign(options, { isSubField: true }));
       else
-        escapedFieldName = this.getEscapedColumnName(field.Model, field, this.stackAssign(options, literal.options));
+        escapedColumnName = this.getEscapedColumnName(field.Model, field, this.stackAssign(options, literal.options));
     } else {
-      escapedFieldName = '*';
+      escapedColumnName = '*';
     }
 
-    return `COUNT(${escapedFieldName})${this._getLiteralAlias(literal, options)}`;
+    return `COUNT(${escapedColumnName})${this._getLiteralAlias(literal, options)}`;
   }
 
   _distinctLiteralToString(literal, options) {
@@ -240,13 +246,28 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
       return;
 
     let field = literal.getField(this.connection);
+    if (!field)
+      field = literal.valueOf();
+
     if (!field)
       return 'DISTINCT';
 
-    if (LiteralBase.isLiteral(field))
-      return `DISTINCT ON(${field.toString(this.connection, this.stackAssign(options, { noProjectionAliases: true }))})`;
+    if (LiteralBase.isLiteral(field)) {
+      let fieldStr = field.toString(this.connection, this.stackAssign(options, { noProjectionAliases: true }));
+      if (!fieldStr)
+        return '';
+
+      if (options && options.isSubField)
+        return `DISTINCT ${fieldStr}`;
+
+      return `DISTINCT ON(${fieldStr})`;
+    }
+
+    let escapedColumnName = this.getEscapedColumnName(field.Model, field, this.stackAssign(options, literal.options, { noProjectionAliases: true }));
+    if (options && options.isSubField)
+      return `DISTINCT ${escapedColumnName}`;
 
-    return `DISTINCT ON(${this.getEscapedColumnName(field.Model, field, this.stackAssign(options, literal.options, { noProjectionAliases: true }))})`;
+    return `DISTINCT ON(${escapedColumnName})`;
   }
 
   _fieldLiteralToString(literal, options) {
@@ -257,7 +278,8 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
     if (LiteralBase.isLiteral(field))
       return field.toString(this.connection, options);
 
-    return this.getEscapedProjectionName(field.Model, field, this.stackAssign(options, { noProjectionAliases: (options && !options.isProjection) }, literal.options));
+    let noProjectionAliases = (options && (options.isSubField || !options.isProjection || options.as === false));
+    return this.getEscapedProjectionName(field.Model, field, this.stackAssign(options, { noProjectionAliases }, literal.options));
   }
 
   _maxLiteralToString(literal, options) {
@@ -265,14 +287,14 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
       return;
 
     let field = literal.getField(this.connection);
-    let escapedFieldName;
+    let escapedColumnName;
 
     if (LiteralBase.isLiteral(field))
-      escapedFieldName = field.toString(this.connection, options);
+      escapedColumnName = field.toString(this.connection, this.stackAssign(options, { isSubField: true }));
     else
-      escapedFieldName = this.getEscapedColumnName(field.Model, field, this.stackAssign(options, literal.options));
+      escapedColumnName = this.getEscapedColumnName(field.Model, field, this.stackAssign(options, literal.options));
 
-    return `MAX(${escapedFieldName})${this._getLiteralAlias(literal, options)}`;
+    return `MAX(${escapedColumnName})${this._getLiteralAlias(literal, options)}`;
   }
 
   _minLiteralToString(literal, options) {
@@ -280,14 +302,14 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
       return;
 
     let field = literal.getField(this.connection);
-    let escapedFieldName;
+    let escapedColumnName;
 
     if (LiteralBase.isLiteral(field))
-      escapedFieldName = field.toString(this.connection, options);
+      escapedColumnName = field.toString(this.connection, this.stackAssign(options, { isSubField: true }));
     else
-      escapedFieldName = this.getEscapedColumnName(field.Model, field, this.stackAssign(options, literal.options));
+      escapedColumnName = this.getEscapedColumnName(field.Model, field, this.stackAssign(options, literal.options));
 
-    return `MIN(${escapedFieldName})${this._getLiteralAlias(literal, options)}`;
+    return `MIN(${escapedColumnName})${this._getLiteralAlias(literal, options)}`;
   }
 
   _sumLiteralToString(literal, options) {
@@ -295,14 +317,14 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
       return;
 
     let field = literal.getField(this.connection);
-    let escapedFieldName;
+    let escapedColumnName;
 
     if (LiteralBase.isLiteral(field))
-      escapedFieldName = field.toString(this.connection, options);
+      escapedColumnName = field.toString(this.connection, this.stackAssign(options, { isSubField: true }));
     else
-      escapedFieldName = this.getEscapedColumnName(field.Model, field, this.stackAssign(options, literal.options));
+      escapedColumnName = this.getEscapedColumnName(field.Model, field, this.stackAssign(options, literal.options));
 
-    return `SUM(${escapedFieldName})${this._getLiteralAlias(literal, options)}`;
+    return `SUM(${escapedColumnName})${this._getLiteralAlias(literal, options)}`;
   }
 
   prepareArrayValuesForSQL(array) {
@@ -504,7 +526,7 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
         if (arrayValues.length > 0)
           subParts.push(this.generateSelectQueryCondition(queryPart, arrayValues, options));
 
-        return `(${subParts.join(' OR ')})`;
+        return `(${subParts.join((operator === 'NEQ') ? ' AND ' : ' OR ')})`;
       }
 
       // If no values left in array, then

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix-orm-sql-base",
-  "version": "1.9.4",
+  "version": "1.9.6",
   "description": "SQL base support for Mythix ORM",
   "main": "lib/index",
   "type": "commonjs",
@@ -34,7 +34,7 @@
   },
   "homepage": "https://github.com/th317erd/mythix-orm-sql-base#readme",
   "peerDependencies": {
-    "mythix-orm": "^1.11.5"
+    "mythix-orm": "^1.11.7"
   },
   "dependencies": {
     "luxon": "^3.1.0",