Changes Model.aggregate() to support multiple orders when calling .order() (#207)

Author: dresende

lib/AggregateFunctions.js

@@ -1,3 +1,5 @@
+var Utilities = require("./Utilities");
+
 module.exports = AggregateFunctions;
 
 function AggregateFunctions(opts) {
@@ -43,8 +45,8 @@ function AggregateFunctions(opts) {
 			}
 			return this;
 		},
-		order: function (property, order) {
-			opts.order = [ property, order ];
+		order: function () {
+			opts.order = Utilities.standardizeOrder(Array.prototype.slice.apply(arguments));
 			return this;
 		},
 		select: function () {
@@ -79,9 +81,10 @@ function AggregateFunctions(opts) {
 			}
 
 			var query = opts.driver.getQuery().select().from(opts.table).select(opts.properties);
+			var i, j;
 
-			for (var i = 0; i < aggregates.length; i++) {
-				for (var j = 0; j < aggregates[i].length; j++) {
+			for (i = 0; i < aggregates.length; i++) {
+				for (j = 0; j < aggregates[i].length; j++) {
 					query[aggregates[i][j].f](aggregates[i][j].a, aggregates[i][j].alias);
 				}
 			}
@@ -93,17 +96,21 @@ function AggregateFunctions(opts) {
 			}
 
 			if (opts.order) {
-				query.order.apply(query, opts.order);
+				for (i = 0; i < opts.order.length; i++) {
+					query.order(opts.order[i][0], opts.order[i][1]);
+				}
 			}
 			if (opts.limit) {
 				query.offset(opts.limit[0]).limit(opts.limit[1]);
 			}
 
+			query = query.build();
+
 			if (opts.driver.opts && opts.driver.opts.debug) {
-				require("./Debug").sql(opts.driver_name, query.build());
+				require("./Debug").sql(opts.driver_name, query);
 			}
 
-			opts.driver.execQuery(query.build(), function (err, data) {
+			opts.driver.execQuery(query, function (err, data) {
 				if (err) {
 					return cb(err);
 				}

test/integration2/model-aggregate.js

@@ -150,7 +150,7 @@ describe("Model.aggregate()", function() {
 			before(setup());
 
 			it("should order items", function (done) {
-				Person.aggregate().count().groupBy('name').order('count', 'Z').get(function (err, rows) {
+				Person.aggregate().count().groupBy('name').order('-count').get(function (err, rows) {
 					should.equal(err, null);
 
 					rows.should.be.a("object");