Rename aggregate to aggregation

Author: ppiyush13

src/deriveSqlClauses/projection.js

@@ -1,7 +1,7 @@
 import {addToArray, arrayJoin} from '../arrayUtils';
 import deriveAggregateFields from './aggregation';
 
-export default function projection({fields, groupBy, aggregate}) {
+export default function projection({fields, groupBy, aggregation}) {
     const projectionList = [];
 
     // either set fields or groupby as a base
@@ -12,8 +12,8 @@ export default function projection({fields, groupBy, aggregate}) {
         addToArray(projectionList, groupBy);
     }
 
-    // now add aggregate fields
-    addToArray(projectionList, deriveAggregateFields(aggregate));
+    // now add aggregation fields
+    addToArray(projectionList, deriveAggregateFields(aggregation));
 
     return arrayJoin(projectionList, ', ');
 }

src/deriveSqlClauses/test/projection.test.js

@@ -4,7 +4,7 @@ describe('testing projection output', () => {
     it('when fields are defined', () => {
         const out = deriveProjection({
             fields: ['A', 'B', 'C'],
-            aggregate: [
+            aggregation: [
                 {
                     fn: 'count',
                     args: '*',
@@ -19,7 +19,7 @@ describe('testing projection output', () => {
     it('when fields are not defined', () => {
         const out = deriveProjection({
             fields: [],
-            aggregate: [
+            aggregation: [
                 {
                     fn: 'count',
                     args: '*',

src/index.js

@@ -8,10 +8,10 @@ import {deriveProjection, deriveGroupBy, deriveOrderBy, deriveLimit} from './der
 const convertObjValues2List = composeObjValueMapper(arrify);
 
 export const select = function select(selectConfigs) {
-    const arrifiedSelectConfigs = convertObjValues2List(selectConfigs, ['groupBy', 'aggregate', 'fields', 'orderBy']);
-    const {fields, aggregate, from, where, groupBy, having, orderBy, limit, misc} = arrifiedSelectConfigs;
+    const arrifiedSelectConfigs = convertObjValues2List(selectConfigs, ['groupBy', 'aggregation', 'fields', 'orderBy']);
+    const {fields, aggregation, from, where, groupBy, having, orderBy, limit, misc} = arrifiedSelectConfigs;
 
-    const projectionFields = deriveProjection({fields, groupBy, aggregate});
+    const projectionFields = deriveProjection({fields, groupBy, aggregation});
     const whereClause = buildWhereClause.build(where);
     const havingClause = buildWhereClause.build(having);
     const groupByClause = deriveGroupBy(groupBy);

src/test/index.test.js

@@ -5,7 +5,7 @@ describe('testing json2sql module', () => {
         [
             {
                 fields: ['A', 'B'],
-                aggregate: [ 
+                aggregation: [ 
                     {
                         fn: 'count',
                         args: 'D',
@@ -52,7 +52,7 @@ describe('testing json2sql module', () => {
         ],
         [
             {
-                aggregate: [
+                aggregation: [
                     {
                         clause: 'uniq(name)',
                         alias: 'UniquesNames'
@@ -146,7 +146,7 @@ describe('testing json2sql module', () => {
         [
             {
                 fields: ['A', 'B'],
-                aggregate: [ 
+                aggregation: [ 
                     {
                         fn: 'count',
                         args: 'D',