mythix-orm-sql-base 1.9.3 → 1.9.5

package/lib/sql-connection-base.js

@@ -661,24 +661,37 @@ class SQLConnectionBase extends ConnectionBase {
     queryEngine = await this.finalizeQuery('read', queryEngine, options);
     queryEngine = queryEngine.clone();
 
-    // let queryContext  = queryEngine.getOperationContext();
-    // let distinct      = queryContext.distinct;
-    // if (distinct) {
-    //   let fullyQualifiedFieldName = distinct.getFullyQualifiedFieldName();
+    let queryGenerator  = this.getQueryGenerator();
+    let queryContext    = queryEngine.getOperationContext();
+    let distinct        = queryContext.distinct;
+
+    if (distinct) {
+      let distinctField = distinct.getField(this);
+      if (distinctField) {
+        if (Literals.LiteralBase.isLiteral(distinctField)) {
+          let field = distinctField.getField(this);
+          if (!field)
+            field = distinctField.valueOf();
+
+          if (field)
+            distinctField = field;
+        }
 
-    //   if (fullyQualifiedFieldName) {
-    //     let LiteralConstructor = literal.constructor;
-    //     literal = new LiteralConstructor(fullyQualifiedFieldName);
+        if (typeof distinctField.isField === 'function' && distinctField.isField(distinctField))
+          distinctField = new Literals.Literal(`DISTINCT ${queryGenerator.getEscapedColumnName(distinctField.Model, distinctField)}`, { isAggregate: true });
+        else
+          distinctField = new Literals.Literal(`DISTINCT ${distinctField.toString(this, { isAggregate: true })}`, { isAggregate: true });
 
-    //     queryEngine = queryEngine.DISTINCT(false).PROJECT(literal);
-    //   }
-    // }
+        let LiteralConstructor = literal.constructor;
+        literal = new LiteralConstructor(distinctField);
 
-    let literalStr      = literal.toString(this);
-    let queryGenerator  = this.getQueryGenerator();
-    let query           = queryEngine.PROJECT(literal).ORDER(); // TODO: Remove ORDER here once aggregate ORDER BY is fixed
-    let sqlStr          = queryGenerator.generateSelectStatement(query, options);
+        queryEngine = queryEngine.DISTINCT(false);
+      }
+    }
 
+    let literalStr  = literal.toString(this);
+    let query       = queryEngine.PROJECT(literal).ORDER(); // TODO: Remove ORDER here once aggregate ORDER BY is fixed
+    let sqlStr      = queryGenerator.generateSelectStatement(query, this.stackAssign(options, { isAggregate: true }));
     let result      = await this.query(sqlStr, options);
     let columnIndex = result.columns.indexOf(literalStr);
     if (columnIndex < 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix-orm-sql-base",
-  "version": "1.9.3",
+  "version": "1.9.5",
   "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.4"
+    "mythix-orm": "^1.11.6"
   },
   "dependencies": {
     "luxon": "^3.1.0",