Merge pull request #352 from TorchlightSoftware/fix-create-rel

handle relationship create with [array]

lib/relation-definition.js

@@ -3,6 +3,7 @@
  */
 var assert = require('assert');
 var util = require('util');
+var async = require('async');
 var utils = require('./utils');
 var i8n = require('inflection');
 var defineScope = require('./scope.js').defineScope;
@@ -910,39 +911,46 @@ HasManyThrough.prototype.create = function create(data, done) {
     done = data;
     data = {};
   }
+  done = done || function(){};
 
   var modelInstance = this.modelInstance;
 
   // First create the target model
   modelTo.create(data, function (err, to) {
     if (err) {
-      return done && done(err, to);
+      return done(err, to);
     }
     // The primary key for the target model
     var pk2 = definition.modelTo.definition.idName();
-    
     var keys = throughKeys(definition);
     var fk1 = keys[0];
     var fk2 = keys[1];
     
-    var d = {};
+    function createRelation(to, next) {
-    d[fk1] = modelInstance[definition.keyFrom];
+      var d = {};
-    d[fk2] = to[pk2];
+      d[fk1] = modelInstance[definition.keyFrom];
-    
+      d[fk2] = to[pk2];
-    definition.applyProperties(modelInstance, d);
+      definition.applyProperties(modelInstance, d);
-    
+      
-    // Then create the through model
+      // Then create the through model
-    modelThrough.create(d, function (e, through) {
+      modelThrough.create(d, function (e, through) {
-      if (e) {
+        if (e) {
-        // Undo creation of the target model
+          // Undo creation of the target model
-        to.destroy(function () {
+          to.destroy(function () {
-          done && done(e);
+            next(e);
-        });
+          });
-      } else {
+        } else {
-        self.addToCache(to);
+          self.addToCache(to);
-        done && done(err, to);
+          next(err, to);
-      }
+        }
-    });
+      });
+    }
+
+    // process array or single item
+    if (!Array.isArray(to))
+      createRelation(to, done);
+    else
+      async.map(to, createRelation, done);
   });
 };
 

test/relations.test.js

@@ -294,6 +294,29 @@ describe('relations', function () {
       });
     });
 
+    it('should create multiple records on scope', function (done) {
+      var async = require('async');
+      Physician.create(function (err, physician) {
+        physician.patients.create([{}, {}], function (err, patients) {
+          should.not.exist(err);
+          should.exist(patients);
+          patients.should.have.lengthOf(2);
+          function verifyPatient(patient, next) {
+            Appointment.find({where: {
+              physicianId: physician.id,
+              patientId: patient.id
+            }},
+              function(err, apps) {
+                should.not.exist(err);
+                apps.should.have.lengthOf(1);
+                next();
+            });
+          }
+          async.forEach(patients, verifyPatient, done);
+        });
+      });
+    });
+
     it('should fetch all scoped instances', function (done) {
       Physician.create(function (err, physician) {
         physician.patients.create({name: 'a'}, function () {
@@ -3384,4 +3407,4 @@ describe('relations', function () {
     
   });
 
-});
+});