Stable Version 1.0.0-alpha.3.

js-data · Nov 23, 2014 · e8d1586 · e8d1586
1 parent 204d5c5
commit e8d1586
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+##### 1.0.0-alpha.3 - 23 November 2014
+
+###### Backwards compatible bug fixes
+- Fixed the "in", "notIn", "|in", and "|notIn" operators
+
 ##### 1.0.0-alpha.2 - 23 November 2014
 
 Upgraded dependencies

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "js-data-rethinkdb",
   "description": "RethinkDB adapter for js-data.",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-alpha.3",
   "homepage": "http://www.js-data.io/docs/dsrethinkdbadapter",
   "repository": {
     "type": "git",

diff --git a/src/index.js b/src/index.js
@@ -63,37 +63,37 @@ function filterQuery(resourceConfig, params, options) {
     }
     forOwn(criteria, function (v, op) {
       if (op === '==' || op === '===') {
-        subQuery = subQuery ? subQuery.and(r.row(field).eq(v)) : r.row(field).eq(v);
+        subQuery = subQuery ? subQuery.and(r.row(field).default(null).eq(v)) : r.row(field).default(null).eq(v);
       } else if (op === '!=' || op === '!==') {
-        subQuery = subQuery ? subQuery.and(r.row(field).ne(v)) : r.row(field).ne(v);
+        subQuery = subQuery ? subQuery.and(r.row(field).default(null).ne(v)) : r.row(field).default(null).ne(v);
       } else if (op === '>') {
-        subQuery = subQuery ? subQuery.and(r.row(field).gt(v)) : r.row(field).gt(v);
+        subQuery = subQuery ? subQuery.and(r.row(field).default(null).gt(v)) : r.row(field).default(null).gt(v);
       } else if (op === '>=') {
-        subQuery = subQuery ? subQuery.and(r.row(field).ge(v)) : r.row(field).ge(v);
+        subQuery = subQuery ? subQuery.and(r.row(field).default(null).ge(v)) : r.row(field).default(null).ge(v);
       } else if (op === '<') {
-        subQuery = subQuery ? subQuery.and(r.row(field).lt(v)) : r.row(field).lt(v);
+        subQuery = subQuery ? subQuery.and(r.row(field).default(null).lt(v)) : r.row(field).default(null).lt(v);
       } else if (op === '<=') {
-        subQuery = subQuery ? subQuery.and(r.row(field).le(v)) : r.row(field).le(v);
+        subQuery = subQuery ? subQuery.and(r.row(field).default(null).le(v)) : r.row(field).default(null).le(v);
       } else if (op === 'in') {
-        subQuery = subQuery ? subQuery.and(r.row(field).contains(v)) : r.row(field).contains(v);
+        subQuery = subQuery ? subQuery.and(r.expr(v).default(r.expr([])).contains(r.row(field).default(null))) : r.expr(v).default(r.expr([])).contains(r.row(field).default(null));
       } else if (op === 'notIn') {
-        subQuery = subQuery ? subQuery.and(r.row(field).contains(v).not()) : r.row(field).contains(v).not();
+        subQuery = subQuery ? subQuery.and(r.expr(v).default(r.expr([])).contains(r.row(field).default(null)).not()) : r.expr(v).default(r.expr([])).contains(r.row(field).default(null)).not();
       } else if (op === '|==' || op === '|===') {
-        subQuery = subQuery ? subQuery.or(r.row(field).eq(v)) : r.row(field).eq(v);
+        subQuery = subQuery ? subQuery.or(r.row(field).default(null).eq(v)) : r.row(field).default(null).eq(v);
       } else if (op === '|!=' || op === '|!==') {
-        subQuery = subQuery ? subQuery.or(r.row(field).ne(v)) : r.row(field).ne(v);
+        subQuery = subQuery ? subQuery.or(r.row(field).default(null).ne(v)) : r.row(field).default(null).ne(v);
       } else if (op === '|>') {
-        subQuery = subQuery ? subQuery.or(r.row(field).gt(v)) : r.row(field).gt(v);
+        subQuery = subQuery ? subQuery.or(r.row(field).default(null).gt(v)) : r.row(field).default(null).gt(v);
       } else if (op === '|>=') {
-        subQuery = subQuery ? subQuery.or(r.row(field).ge(v)) : r.row(field).ge(v);
+        subQuery = subQuery ? subQuery.or(r.row(field).default(null).ge(v)) : r.row(field).default(null).ge(v);
       } else if (op === '|<') {
-        subQuery = subQuery ? subQuery.or(r.row(field).lt(v)) : r.row(field).lt(v);
+        subQuery = subQuery ? subQuery.or(r.row(field).default(null).lt(v)) : r.row(field).default(null).lt(v);
       } else if (op === '|<=') {
-        subQuery = subQuery ? subQuery.or(r.row(field).le(v)) : r.row(field).le(v);
+        subQuery = subQuery ? subQuery.or(r.row(field).default(null).le(v)) : r.row(field).default(null).le(v);
       } else if (op === '|in') {
-        subQuery = subQuery ? subQuery.or(r.row(field).contains(v)) : r.row(field).contains(v);
+        subQuery = subQuery ? subQuery.or(r.expr(v).default(r.expr([])).contains(r.row(field).default(null))) : r.expr(v).default(r.expr([])).contains(r.row(field).default(null));
       } else if (op === '|notIn') {
-        subQuery = subQuery ? subQuery.or(r.row(field).contains(v).not()) : r.row(field).contains(v).not();
+        subQuery = subQuery ? subQuery.or(r.expr(v).default(r.expr([])).contains(r.row(field).default(null)).not()) : r.expr(v).default(r.expr([])).contains(r.row(field).default(null)).not();
       }
     });
   });