Stable Version 0.11.7

js-data · Dec 7, 2015 · db63dd0 · db63dd0
1 parent d3d0b9b
commit db63dd0
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/dist/js-data-sql.js b/dist/js-data-sql.js
@@ -436,9 +436,17 @@ module.exports =
 	            }
 
 	            if (op === '==' || op === '===') {
-	              query = query.where(field, v);
+	              if (v === null) {
+	                query = query.whereNull(field);
+	              } else {
+	                query = query.where(field, v);
+	              }
 	            } else if (op === '!=' || op === '!==') {
-	              query = query.where(field, '!=', v);
+	              if (v === null) {
+	                query = query.whereNotNull(field);
+	              } else {
+	                query = query.where(field, '!=', v);
+	              }
 	            } else if (op === '>') {
 	              query = query.where(field, '>', v);
 	            } else if (op === '>=') {
@@ -496,9 +504,17 @@ module.exports =
 	              } else if (op === 'like') {
 	                query = query.where(field, 'like', v);
 	              } else if (op === '|==' || op === '|===') {
-	                query = query.orWhere(field, v);
+	                if (v === null) {
+	                  query = query.orWhereNull(field);
+	                } else {
+	                  query = query.orWhere(field, v);
+	                }
 	              } else if (op === '|!=' || op === '|!==') {
-	                query = query.orWhere(field, '!=', v);
+	                if (v === null) {
+	                  query = query.orWhereNotNull(field);
+	                } else {
+	                  query = query.orWhere(field, '!=', v);
+	                }
 	              } else if (op === '|>') {
 	                query = query.orWhere(field, '>', v);
 	              } else if (op === '|>=') {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "js-data-sql",
   "description": "Postgres/MySQL/MariaDB/SQLite3 adapter for js-data.",
-  "version": "0.11.6",
+  "version": "0.11.7",
   "homepage": "http://www.js-data.io/docs/dssqladapter",
   "repository": {
     "type": "git",