Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/data/store/extract-query-options.js

Author: Valodya

package.json

@@ -1,6 +1,6 @@
 {
   "name": "backendless",
-  "version": "4.1.8",
+  "version": "4.2.0",
   "description": "Backendless JavaScript SDK for Node.js and the browser",
   "browser": "dist/backendless.js",
   "main": "lib/index.js",

src/data/query-builder.js

@@ -63,6 +63,16 @@ export default class DataQueryBuilder {
     return this
   }
 
+  getHavingClause() {
+    return this._query.havingClause
+  }
+
+  setHavingClause(havingClause) {
+    this._query.havingClause = havingClause
+
+    return this
+  }
+
   getSortBy() {
     return this._query.getOption('sortBy')
   }
@@ -73,6 +83,16 @@ export default class DataQueryBuilder {
     return this
   }
 
+  getGroupBy() {
+    return this._query.getOption('groupBy')
+  }
+
+  setGroupBy(groupBy) {
+    this._query.setOption('groupBy', Utils.castArray(groupBy))
+
+    return this
+  }
+
   getRelated() {
     return this._query.getOption('relations')
   }

src/data/query.js

@@ -4,6 +4,7 @@ export default class DataQuery {
 
     this.properties = args.properties || []
     this.condition = args.condition || null
+    this.havingClause = args.havingClause || null
     this.options = args.options || null
     this.url = args.url || null
   }

src/data/store/extract-query-options.js

@@ -30,6 +30,14 @@ export function extractQueryOptions(options) {
     }
   }
 
+  if (options.groupBy) {
+    if (Utils.isString(options.groupBy)) {
+      params.push('groupBy=' + encodeURIComponent(options.groupBy))
+    } else if (Utils.isArray(options.groupBy)) {
+      params.push('groupBy=' + Utils.encodeArrayToUriComponent(options.groupBy))
+    }
+  }
+
   if (Utils.isNumber(options.relationsDepth)) {
     params.push('relationsDepth=' + options.relationsDepth)
   }

src/data/store/find.js

@@ -28,6 +28,10 @@ export function findUtil(className, Model, dataQuery, asyncHandler) {
     query.push('where=' + encodeURIComponent(dataQuery.condition))
   }
 
+  if (dataQuery.havingClause) {
+    query.push('having=' + encodeURIComponent(dataQuery.havingClause))
+  }
+
   if (dataQuery.properties && dataQuery.properties.length) {
     query.push('props=' + Utils.encodeArrayToUriComponent(dataQuery.properties))
   }

src/data/store/relations.js

@@ -110,6 +110,10 @@ export function loadRelations(parentObjectId, queryBuilder, asyncHandler) {
     query.push('where=' + encodeURIComponent(dataQuery.condition))
   }
 
+  if (dataQuery.havingClause) {
+    query.push('having=' + encodeURIComponent(dataQuery.havingClause))
+  }
+
   let url = Urls.dataTableObjectRelation(this.className, parentObjectId, relationName)
 
   if (asyncHandler) {