Support GROUP BY

README.md

@@ -236,7 +236,11 @@ var data = {
         query: 'JOIN table_b on table_a.join_id = table_b.id',
     },
     selects: 'table_b.*',
-    orderBy: ['join_id'],
+    groupBy: 'join_id',
+    orderBy: [
+        'join_id',
+        'another_column',
+    ],
 };
 
 // Or find and return all data from `table_a`

lib/websqlClass.js

@@ -202,7 +202,7 @@
                 }
                 this.queryType = 'drop';
                 this.queryCallback = this.callback;
-                this.querySuccessMsg = 'Table' + (data.data.length > 0 ? 's' : '') + ' dropped successfully';
+                this.querySuccessMsg = 'Table' + (data.data.length === 1 ? '' : 's') + ' dropped successfully';
                 this.queryFailMsg = 'Error during DROP transaction';
                 break;
             case 'insert':
@@ -286,9 +286,12 @@
                 break;
             case 'find':
                 this.conditions = '';
+                this.groupBy    = '';
                 this.orderBy    = '';
 
-                if (Object.keys(data.data).length > 0) {
+                if (typeof data.data === 'string') {
+                    this.conditions = data.data;
+                } else if (Object.keys(data.data).length > 0) {
                     for (key in data.data) {
                         var val = data.data[key];
 
@@ -338,30 +341,44 @@
 
                 if (data.selects) {
                     data.selects = Array.isArray(data.selects) ? data.selects.join(', ') : data.selects;
-                    this.query = 'SELECT ' + data.selects + ', ' + this.table + '.* ';
-                } else {
+                    this.query = 'SELECT ' + data.selects;
+
                     if (data.join) {
-                        this.query = 'SELECT *, ' + this.table + '.* ';
-                    } else {
-                        this.query = 'SELECT * ';
+                        this.query += ', ' + this.table + '.*';
                     }
+                } else if (data.join) {
+                    this.query = 'SELECT *, ' + this.table + '.*';
+                } else {
+                    this.query = 'SELECT *';
                 }
 
+                this.query += ' ';
+
                 if (data.join) {
                     data.join.query = Array.isArray(data.join.query) ? data.join.query.join(' ') : data.join.query;
                     this.conditions = data.join.query + ' ' + this.conditions;
                 }
 
                 this.query += 'FROM ' + this.table + ' ' + this.conditions;
 
+                if (data.groupBy) {
+                    if (this.groupBy.length === 0) {
+                        this.query += ' GROUP BY ';
+                    } else {
+                        this.query += ' ';
+                    }
+
+                    this.query += Array.isArray(data.groupBy) ? data.orderBy.join(', ') : data.groupBy;
+                }
+
                 if (data.orderBy) {
                     if (this.orderBy.length === 0) {
                         this.query += ' ORDER BY ';
                     } else {
                         this.query += ' ';
                     }
 
-                    this.query += data.orderBy.join(', ');
+                    this.query += Array.isArray(data.orderBy) ? data.orderBy.join(', ') : data.orderBy;
                 }
 
                 this.queryValues = [];

package.json

@@ -1,6 +1,6 @@
 {
   "name": "websql-json",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Web SQLite access library. Communicate easily and cleanly using JSON objects.",
   "main": "./lib/websqlInterface.js",
   "scripts": {