Deletion errors should break transactions

holidayextras · Jul 1, 2016 · 95ae799 · 95ae799
1 parent 0722f1e
commit 95ae799
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/lib/sqlHandler.js b/lib/sqlHandler.js
@@ -27,7 +27,7 @@ SqlStore._sequelizeInstances = Object.create(null);
 SqlStore.prototype.ready = false;
 
 SqlStore._checkMinServerVersion = function() {
-  var serverVersion = require('jsonapi-server')._version;
+  var serverVersion = require("jsonapi-server")._version;
   if (!serverVersion) return;
   if (semver.lt(serverVersion, MIN_SERVER_VERSION)) {
     throw new Error("This version of jsonapi-store-mongodb requires jsonapi-server>=" + MIN_SERVER_VERSION + ".");
@@ -55,8 +55,8 @@ SqlStore.prototype.initialise = function(resourceConfig) {
   // Index the hash map by a hash of the entire config object. If the same config is passed again,
   // reuse the existing Sequelize connection resource instead of opening a new one.
 
-  var md5sum = crypto.createHash('md5');
-  var instanceId = md5sum.update(JSON.stringify(sequelizeArgs)).digest('hex');
+  var md5sum = crypto.createHash("md5");
+  var instanceId = md5sum.update(JSON.stringify(sequelizeArgs)).digest("hex");
   var instances = SqlStore._sequelizeInstances;
 
   if (!instances[instanceId]) {
@@ -344,8 +344,8 @@ SqlStore.prototype._clearAndSetMany = function(relationModel, prop, theResource,
     if (deleteError) return taskCallback(deleteError);
 
     async.map(prop, function(item, acallback) {
-      relationModel.create(item, t).asCallback(function(err4, newRelationModel) {
-        if (err4) return acallback(err4);
+      relationModel.create(item, t).asCallback(function(err, newRelationModel) {
+        if (err) return acallback(err);
 
         theResource["add" + ucKeyName](newRelationModel, t).asCallback(acallback);
       });
@@ -359,8 +359,8 @@ SqlStore.prototype._clearAndSetOne = function(relationModel, prop, theResource,
     if (!prop) {
       theResource["set" + ucKeyName](null, t).asCallback(taskCallback);
     } else {
-      relationModel.create(prop, t).asCallback(function(err3, newRelationModel) {
-        if (err3) return taskCallback(err3);
+      relationModel.create(prop, t).asCallback(function(err, newRelationModel) {
+        if (err) return taskCallback(err);
 
         theResource["set" + ucKeyName](newRelationModel, t).asCallback(taskCallback);
       });