Merge pull request #768 from durango/include-where

Added a spec for hasOne and belongsTo and including those models within another model. Closes #516

spec/associations/belongs-to.spec.js

@@ -49,7 +49,6 @@ describe(Helpers.getTestDialectTeaser("BelongsTo"), function() {
   })
 
   describe("Foreign key constraints", function() {
-
     it("are not enabled by default", function(done) {
       var Task = this.sequelize.define('Task', { title: Sequelize.STRING })
         , User = this.sequelize.define('User', { username: Sequelize.STRING })
@@ -176,7 +175,6 @@ describe(Helpers.getTestDialectTeaser("BelongsTo"), function() {
         })
       })
     })
-
   })
 
   describe("Association options", function() {

spec/associations/mixin.spec.js

@@ -28,5 +28,62 @@ describe(Helpers.getTestDialectTeaser("Mixin"), function() {
 
       expect(User.getAssociation(Task).target).toEqual(Task)
     })
+
+    it('can handle multiple associations just fine', function(done) {
+      var Emit  = require('events').EventEmitter
+        , emit = new Emit()
+        , User  = this.sequelize.define('User', { username: Sequelize.STRING })
+        , Event = this.sequelize.define('Event', { name: Sequelize.STRING })
+        , Place = this.sequelize.define('Place', { name: Sequelize.STRING })
+        , theSQL = ''
+        , count = 0
+        , theEvent
+
+      Event.belongsTo(User)
+      Event.hasOne(Place)
+
+      emit.on('sql', function(sql){
+        ++count
+        theSQL = sql
+        if (count > 1) {
+          emit.emit('spy')
+        }
+      })
+
+      emit.on('find', function(e) {
+        ++count
+        theEvent = e
+        if (count > 1) {
+          emit.emit('spy')
+        }
+      })
+
+      emit.on('spy', function(){
+        expect(theSQL.match(/WHERE ["`]Events["`].["`]id["`]=1;$/)).not.toBeNull()
+        expect(theEvent.name).toEqual('Bob Marley Concert')
+        expect(theEvent.place.name).toEqual('Backyard')
+        expect(theEvent.user.username).toEqual('Dan')
+        done()
+      })
+
+      this.sequelize.sync({force: true }).success(function() {
+        User.create({username: 'Dan'}).success(function(user){
+          Event.create({name: 'Bob Marley Concert'}).success(function(event) {
+            Place.create({name: 'Backyard'}).success(function(place) {
+              event.setUser(user).success(function(){
+                event.setPlace(place).success(function(){
+                  Event.find({where: {id: 1}, include: [User, Place]}).success(function(theEvent){
+                    emit.emit('find', theEvent)
+                  })
+                  .on('sql', function(sql){
+                    emit.emit('sql', sql)
+                  })
+                })
+              })
+            })
+          })
+        })
+      })
+    })
   })
 })