Moves generation of aggregation function alias to builder

Author: dresende

lib/AggregateFunctions.js

@@ -16,10 +16,10 @@ function AggregateFunctions(opts) {
 			var args = (arguments.length && Array.isArray(arguments[0]) ? arguments[0] : Array.prototype.slice.apply(arguments));
 
 			if (args.length > 0) {
-				aggregates[aggregates.length - 1].push({ f: fun, a: args });
+				aggregates[aggregates.length - 1].push({ f: fun, a: args, alias: aggregateAlias(fun, args) });
 				aggregates.push([]);
 			} else {
-				aggregates[aggregates.length - 1].push({ f: fun });
+				aggregates[aggregates.length - 1].push({ f: fun, alias: aggregateAlias(fun, args) });
 			}
 
 			return proto;
@@ -58,7 +58,6 @@ function AggregateFunctions(opts) {
 
 			for (var i = 0; i < aggregates.length; i++) {
 				for (var j = 0; j < aggregates[i].length; j++) {
-					aggregates[i][j].alias = aggregateAlias(aggregates[i][j].f, aggregates[i][j].a);
 					query[aggregates[i][j].f](aggregates[i][j].a, aggregates[i][j].alias);
 				}
 			}