fix(hasOne): make sure it uses the transaction for the select

lib/associations/has-one.js

@@ -67,6 +67,8 @@ module.exports = (function() {
       if (!Utils._.isUndefined(params)) {
       if (!Utils._.isUndefined(params)) {
         if (!Utils._.isUndefined(params.attributes)) {
         if (!Utils._.isUndefined(params.attributes)) {
           params = Utils._.extend({where: where}, params)
           params = Utils._.extend({where: where}, params)
+        } else if (!params.where) {
+          params.where = where
         }
         }
       } else {
       } else {
         params = {where: where}
         params = {where: where}
@@ -83,6 +85,7 @@ module.exports = (function() {
         options.transaction = params.transaction;
         options.transaction = params.transaction;
         delete params.transaction;
         delete params.transaction;
       }
       }
+
       return self.target.find(params, options)
       return self.target.find(params, options)
     }
     }
 
 

test/associations/has-one.test.js

@@ -29,17 +29,21 @@ describe(Support.getTestDialectTeaser("HasOne"), function() {
         Group.hasOne(User)
         Group.hasOne(User)
 
 
         sequelize.sync({ force: true }).success(function() {
         sequelize.sync({ force: true }).success(function() {
-          User.create({ username: 'foo' }).success(function(user) {
-            Group.create({ name: 'bar' }).success(function(group) {
-              sequelize.transaction(function(t) {
-                group.setUser(user, { transaction: t }).success(function() {
-                  Group.all().success(function(groups) {
-                    groups[0].getUser().success(function(associatedUser) {
-                      expect(associatedUser).to.be.null
-                      Group.all({ transaction: t }).success(function(groups) {
-                        groups[0].getUser({ transaction: t }).success(function(associatedUser) {
-                          expect(associatedUser).to.be.not.null
-                          t.rollback().success(function() { done() })
+          User.create({ username: 'foo' }).success(function(fakeUser) {
+            User.create({ username: 'foo' }).success(function(user) {
+              Group.create({ name: 'bar' }).success(function(group) {
+                sequelize.transaction(function(t) {
+                  group.setUser(user, { transaction: t }).success(function() {
+                    Group.all().success(function(groups) {
+                      groups[0].getUser().success(function(associatedUser) {
+                        expect(associatedUser).to.be.null
+                        Group.all({ transaction: t }).success(function(groups) {
+                          groups[0].getUser({ transaction: t }).success(function(associatedUser) {
+                            expect(associatedUser).not.to.be.null
+                            expect(associatedUser.id).to.equal(user.id)
+                            expect(associatedUser.id).not.to.equal(fakeUser.id)
+                            t.rollback().success(function() { done() })
+                          })
                         })
                         })
                       })
                       })
                     })
                     })