Adds composer support for ordering by joined properties

core/required/composer.js

@@ -763,12 +763,6 @@ class Composer {
       transformation = v => `${v}`;
     }
 
-    fields.forEach(field => {
-      if (!this.Model.hasColumn(field)) {
-        throw new Error(`Cannot order by ${field}, it does not belong to ${this.Model.name}`);
-      }
-    });
-
     this._command = {
       type: 'orderBy',
       data: {

core/required/db/sql_adapter.js

@@ -186,7 +186,7 @@ class SQLAdapter {
         this.generateJoinClause(table, joinArray, paramOffset),
         this.generateWhereClause(table, multiFilter, paramOffset),
         this.generateGroupByClause(table, groupByArray),
-        this.generateOrderByClause(table, orderByArray, groupByArray),
+        this.generateOrderByClause(table, orderByArray, groupByArray, joinArray),
         this.generateLimitClause(limitObj)
     ].join('');
 
@@ -530,11 +530,32 @@ class SQLAdapter {
       .map(whereObj => whereObj.value);
   }
 
-  generateOrderByClause(table, orderByArray, groupByArray) {
+  generateOrderByClause(table, orderByArray, groupByArray, joinArray) {
 
-    return !orderByArray.length ? '' : ' ORDER BY ' + orderByArray.map(v => {
-      let columns = v.columnNames.map(columnName => `${this.escapeField(table)}.${this.escapeField(columnName)}`);
-      return `${(v.transformation || (v => v)).apply(null, columns)} ${v.direction}`;
+    let columnEscapedOrderByArray = orderByArray.map(v => {
+      v.escapedColumns = v.columnNames.map((columnName) => {
+        let columnNameComponents = columnName.split('__');
+        if (columnNameComponents.length === 1) {
+          return `${this.escapeField(table)}.${this.escapeField(columnName)}`; 
+        } else if (joinArray) {
+          let join = joinArray[0].find((join) => join.joinAlias === columnNameComponents.slice(0, -1).join('__'));
+          if (!join) {
+            return `${this.escapeField(table)}.${this.escapeField(columnName)}`; 
+          }
+          return `${this.escapeField(join.joinAlias)}.${this.escapeField(columnNameComponents[columnNameComponents.length - 1])}`
+        } else {
+          return null;
+        }
+      }).filter((columnName) => {
+        return !!columnName;
+      });
+      return v;
+    }).filter((v) => {
+      return v.escapedColumns.length;
+    });
+
+    return !columnEscapedOrderByArray.length ? '' : ' ORDER BY ' + columnEscapedOrderByArray.map(v => {
+      return `${(v.transformation || (v => v)).apply(null, v.escapedColumns)} ${v.direction}`;
     }).join(', ');
 
   }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodal",
-  "version": "0.14.0-rc7",
+  "version": "0.14.0-rc8",
   "description": "An API Server and Framework for node.js",
   "keywords": [
     "framework",

test/tests/composer.js

@@ -308,6 +308,24 @@ module.exports = Nodal => {
 
     });
 
+    it('Should orderBy a joined property properly (DESC)', function(done) {
+
+      Child.query()
+        .join('parent')
+        .orderBy('parent__name', 'DESC')
+        .end((err, children) => {
+
+          expect(err).to.equal(null);
+          expect(children).to.be.an.instanceOf(Nodal.ModelArray);
+          expect(children.length).to.equal(100);
+          expect(children[0].joined('parent').get('name')).to.equal('Zoolander');
+          expect(children[99].joined('parent').get('name')).to.equal('Albert');
+          done();
+
+        });
+
+    });
+
     it('Should limit properly (10)', function(done) {
 
       Child.query()