Added support for isnull and notnull query

index.js

@@ -1,31 +1,26 @@
 
 
-var functionOperators = [
-  'BETWEEN',
-  'IN',
-  /* ---- */
-  'OR',
-  'AND',
-  /* ---- */
-  'OR_BETWEEN',
-  'OR_IN',
-  /* ---- */
-  'AND_BETWEEN',
-  'AND_IN'
-];
 
 var functionOperatorMap = {
   BETWEEN: 'whereBetween',
   IN: 'whereIn',
+  ISNULL: 'whereNull',
+  NOTNULL: 'whereNotNull',
   /* ---- */
   OR: 'orWhere',
   AND: 'where',
+  EQ: 'where',
+  '=': 'where',
   /* ---- */
   OR_BETWEEN: 'orWhereBetween',
   OR_IN: 'orWhereIn',
+  OR_ISNULL: 'orWhereNull',
+  IR_NOTNULL: 'orWhereNotNull',
   /* ---- */
   AND_BETWEEN: 'andWhereBetween',
-  AND_IN: 'andWhereIn'
+  AND_IN: 'andWhereIn',
+  AND_ISNULL: 'andWhereNull',
+  AND_NOTNULL: 'andWhereNotNull',
 };
 
 
@@ -33,19 +28,19 @@ var functionOperatorMap = {
 function addCondition (q, field, val) {
   if (Array.isArray(val[0])) {
     return q.where(function () {
-      return val.forEach(addCondition.bind(null, this, field))
+      return val.forEach(addCondition.bind(null, this, field));
-    })
+    });
   }
   
   if (!Array.isArray(val)) {
-    val = ['AND', field, val ]
+    val = ['AND', field, val ];
-  } else if (functionOperators.indexOf(val[0]) !== -1) {
+  } else if (functionOperatorMap.hasOwnProperty( val[0] ) ) {
-    val.splice(1, 0, field)
+    val = [ val[0], field ].concat(val.slice(1));
   } else {
-    val = [ 'AND', field ].concat(val)
+    val = [ 'AND', field ].concat(val);
   }
 
-  return q[functionOperatorMap[val[0]]].apply(q, val.slice(1))
+  return q[functionOperatorMap[val[0]]].apply(q, val.slice(1));
 }
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "knex-json-query",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "A high-level utility which will will generate Knex query from a single JSON object.",
   "main": "index.js",
   "scripts": {

test.js

@@ -12,6 +12,16 @@ var conditions= [
     input:{ f1: 10, f2: 20, f3: 30 },
     output: 'select * where ("f1" = 10 and "f2" = 20 and "f3" = 30)'
   },
+  {
+    name: 'handle simple and conditions',
+    input:{"firstName":[["LIKE","H%"],["OR","hemanth"]]},
+    output: 'select * where (("firstName" LIKE \'H%\' or "firstName" = \'hemanth\'))'
+  },
+  {
+    name: 'handle simple and conditions',
+    input:{ f1: [[ 'A' ],['LIKE', 'B' ]], f2: 20, f3: 30 },
+    output: 'select * where (("f1" = \'A\' and "f1" LIKE \'B\') and "f2" = 20 and "f3" = 30)'
+  },
   {
     name: 'handle basic operators :: greater-than less-than',
     input:{ f1: ['>', 10], f2: [ '<', 20 ], f3: 30 },