pass associations on success to the callback + example

sdepold · May 4, 2011 · 00ebd92 · 00ebd92
1 parent 98a5bff
commit 00ebd92
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 64 deletions.
diff --git a/examples/UsingMultipleModelFiles/Project.js b/examples/UsingMultipleModelFiles/Project.js
diff --git a/examples/UsingMultipleModelFiles/Task.js b/examples/UsingMultipleModelFiles/Task.js
diff --git a/examples/UsingMultipleModelFiles/app.js b/examples/UsingMultipleModelFiles/app.js
diff --git a/examples/using-multiple-model-files/Project.js b/examples/using-multiple-model-files/Project.js
@@ -0,0 +1,6 @@
+module.exports = function(sequelize, DataTypes) {
+  return sequelize.define("Project", {
+    name: DataTypes.STRING,
+    description: DataTypes.TEXT
+  })
+}
diff --git a/examples/using-multiple-model-files/Task.js b/examples/using-multiple-model-files/Task.js
@@ -0,0 +1,7 @@
+module.exports = function(sequelize, DataTypes) {
+  return sequelize.define("Task", {
+    name: DataTypes.STRING,
+    deadline: DataTypes.DATE,
+    importance: DataTypes.INTEGER
+  })
+}
diff --git a/examples/using-multiple-model-files/app.js b/examples/using-multiple-model-files/app.js
@@ -0,0 +1,25 @@
+var Sequelize = require(__dirname + "/../../index")
+  , config    = require(__dirname + "/../../test/config")
+  , sequelize = new Sequelize(config.database, config.username, config.password, {logging: false})
+  , Project   = sequelize.import(__dirname + "/Project")
+  , Task      = sequelize.import(__dirname + "/Task")
+
+Project.hasMany(Task)
+Task.belongsTo(Project)
+
+sequelize.sync({force: true}).on('success', function() {
+  Project
+    .create({ name: 'Sequelize', description: 'A nice MySQL ORM for NodeJS' })
+    .on('success', function(project) {
+      Task.create({ name: 'Choose a nice MySQL connector', deadline: new Date(), importance: 10 })
+        .on('success', function(task1) {
+          Task.create({ name: 'Build the rest', deadline: new Date(), importance: 90 })
+            .on('success', function(task2) {
+              project.setTasks([task1, task2]).on('success', function(tasks) {
+                console.log(project)
+                console.log(tasks)
+              })
+            })
+        })
+    })
+})
diff --git a/lib/sequelize/associations/has-many-double-linked.js b/lib/sequelize/associations/has-many-double-linked.js
@@ -86,7 +86,7 @@ HasManyDoubleLinked.prototype.injectSetter = function(emitter, oldAssociations,
 
       chainer
         .run()
-        .on('success', function() { emitter.emit('success', null) })
+        .on('success', function() { emitter.emit('success', newAssociations) })
         .on('failure', function(err) { emitter.emit('failure', err) })
     })
 }
diff --git a/lib/sequelize/associations/has-many-single-linked.js b/lib/sequelize/associations/has-many-single-linked.js
@@ -28,7 +28,7 @@ HasManySingleLinked.prototype.injectSetter = function(emitter, oldAssociations,
     chainer.add(associatedObject.save())
   })
   chainer
-  .run()
-  .on('success', function() { emitter.emit('success', null) })
-  .on('failure', function() { emitter.emit('failure', null) })
+    .run()
+    .on('success', function() { emitter.emit('success', newAssociations) })
+    .on('failure', function(err) { emitter.emit('failure', err) })
 }
diff --git a/lib/sequelize/associations/has-many.js b/lib/sequelize/associations/has-many.js
@@ -85,8 +85,8 @@ HasMany.prototype.injectSetter = function(obj) {
             currentAssociatedObjects.push(newAssociatedObject)
 
           instance[self.accessors.set](currentAssociatedObjects)
-            .on('success', function() { customEventEmitter.emit('success', null) })
-            .on('failure', function() { customEventEmitter.emit('failure', null) })
+            .on('success', function(instances) { customEventEmitter.emit('success', instances) })
+            .on('failure', function(err) { customEventEmitter.emit('failure', err) })
         })
     })
     return customEventEmitter.run()