Merge branch 'master' into release

js-data · Oct 17, 2016 · bc0afb3 · bc0afb3
2 parents f61cbe5 + eb6e315
commit bc0afb3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+##### 3.0.0-rc.3 - 17 October 2016
+
+###### Bug fixes
+- Fixed update throwing error when record was unchanged.
+
 ##### 3.0.0-rc.2 - 23 August 2016
 
 ###### Backwards compatible changes

diff --git a/mocha.start.js b/mocha.start.js
@@ -1,4 +1,3 @@
-/*global assert:true */
 'use strict'
 
 // prepare environment for js-data-adapter-tests

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "js-data-rethinkdb",
   "description": "RethinkDB adapter for js-data.",
-  "version": "3.0.0-rc.2",
+  "version": "3.0.0-rc.3",
   "homepage": "https://github.com/js-data/js-data-rethinkdb",
   "repository": {
     "type": "git",
@@ -63,10 +63,10 @@
     "mout": "1.0.0"
   },
   "peerDependencies": {
-    "js-data": "^3.0.0-rc.4",
+    "js-data": "^3.0.0-rc.6",
     "rethinkdbdash": ">=2.0.0"
   },
   "devDependencies": {
-    "js-data-repo-tools": "0.5.6"
+    "js-data-repo-tools": "0.5.7"
   }
 }
diff --git a/src/index.js b/src/index.js
@@ -414,14 +414,14 @@ Adapter.extend({
       .update(props, updateOpts)
       .run(this.getOpt('runOpts', opts))
       .then((cursor) => {
-        let record
         this._handleErrors(cursor)
-        if (cursor && cursor.changes && cursor.changes.length && cursor.changes[0].new_val) {
-          record = cursor.changes[0].new_val
-        } else {
+        if (cursor.skipped) {
           throw new Error('Not Found')
+        } else if (cursor && cursor.changes && cursor.changes.length && cursor.changes[0].new_val) {
+          return [cursor.changes[0].new_val, cursor]
+        } else {
+          return this._find(mapper, id, opts)
         }
-        return [record, cursor]
       })
   },