mirror of
https://github.com/harish2704/knex-json-query.git
synced 2026-09-10 04:41:07 +00:00
Added support for isnull and notnull query
This commit is contained in:
@@ -1,24 +1,11 @@
|
||||
|
||||
|
||||
var functionOperators = [
|
||||
'BETWEEN',
|
||||
'IN',
|
||||
/* ---- */
|
||||
'OR',
|
||||
'AND',
|
||||
'EQ',
|
||||
'=',
|
||||
/* ---- */
|
||||
'OR_BETWEEN',
|
||||
'OR_IN',
|
||||
/* ---- */
|
||||
'AND_BETWEEN',
|
||||
'AND_IN'
|
||||
];
|
||||
|
||||
var functionOperatorMap = {
|
||||
BETWEEN: 'whereBetween',
|
||||
IN: 'whereIn',
|
||||
ISNULL: 'whereNull',
|
||||
NOTNULL: 'whereNotNull',
|
||||
/* ---- */
|
||||
OR: 'orWhere',
|
||||
AND: 'where',
|
||||
@@ -27,9 +14,13 @@ var functionOperatorMap = {
|
||||
/* ---- */
|
||||
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',
|
||||
};
|
||||
|
||||
|
||||
@@ -43,7 +34,7 @@ function addCondition (q, field, val) {
|
||||
|
||||
if (!Array.isArray(val)) {
|
||||
val = ['AND', field, val ];
|
||||
} else if (functionOperators.indexOf(val[0]) !== -1) {
|
||||
} else if (functionOperatorMap.hasOwnProperty( val[0] ) ) {
|
||||
val = [ val[0], field ].concat(val.slice(1));
|
||||
} else {
|
||||
val = [ 'AND', field ].concat(val);
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "knex-json-query",
|
||||
"version": "0.0.3",
|
||||
"version": "0.0.4",
|
||||
"description": "A high-level utility which will will generate Knex query from a single JSON object.",
|
||||
"main": "index.js",
|
||||
"scripts": {
|
||||
|
||||
Reference in New Issue
Block a user