3.0.0-alpha.2

js-data · Feb 27, 2016 · 9ab69c3 · 9ab69c3
1 parent 6b6ed72
commit 9ab69c3
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+##### 3.0.0-alpha.2 - 26 February 2016
+
+###### Backwards compatible bug fixes
+- Fixed edge case with returnDeletedIds
+
 ##### 3.0.0-alpha.1 - 26 February 2016
 
 ###### Breaking API changes

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -5,5 +5,5 @@
 # Names should be added to this file as:
 #   [commit count] Name <email address>
      1	InternalFX <bryan@internalfx.com>
-    39	Jason Dobry <jason.dobry@gmail.com>
+    43	Jason Dobry <jason.dobry@gmail.com>
      2	Ollie Relph <ollie@relph.me>
diff --git a/dist/js-data-rethinkdb.js b/dist/js-data-rethinkdb.js
diff --git a/dist/js-data-rethinkdb.js.map b/dist/js-data-rethinkdb.js.map
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-alpha.1",
+  "version": "3.0.0-alpha.2",
   "homepage": "https://github.com/js-data/js-data-rethinkdb",
   "repository": {
     "type": "git",
@@ -59,7 +59,7 @@
     "babel-preset-stage-0": "6.5.0",
     "chai": "3.5.0",
     "codacy-coverage": "1.1.3",
-    "coveralls": "2.11.6",
+    "coveralls": "2.11.8",
     "ink-docstrap": "1.1.2",
     "istanbul": "0.4.2",
     "js-data-adapter-tests": "^2.0.0-alpha.7",

diff --git a/src/index.js b/src/index.js
@@ -552,17 +552,17 @@ addHiddenPropsToTarget(RethinkDBAdapter.prototype, {
       return self.selectTable(mapper, opts).get(id).delete().run()
     }).then(function (cursor) {
       let deleted = 0
-      if (cursor && cursor.deleted) {
+      if (cursor && cursor.deleted && returnDeletedIds) {
         deleted = cursor.deleted
       }
       // afterDestroy lifecycle hook
       op = opts.op = 'afterDestroy'
       return resolve(self[op](mapper, id, opts, deleted ? id : undefined)).then(function (_id) {
         // Allow for re-assignment from lifecycle hook
-        id = isUndefined(_id) && returnDeletedIds ? id : _id
+        id = isUndefined(_id) && deleted ? id : _id
         const result = {}
         fillIn(result, cursor)
-        result.data = deleted ? id : undefined
+        result.data = id
         return self.getRaw(opts) ? result : result.data
       })
     })