bugfixing

src/SequelizeTable.js

@@ -240,15 +240,20 @@ SequelizeTable = function(sequelize, tableName, attributes) {
         var self = this
         
         this[assocName](function(currentAssociation) {
+          var attr = {}
+          if(currentAssociation == null) {
+            attr[table.identifier] = self.id
+            object.updateAttributes(attr, callback)
+          } else {
             if(object.id == currentAssociation.id) callback()
             else {
-            var attr = {}
               attr[table.identifier] = null
               currentAssociation.updateAttributes(attr, function() {
                 attr[table.identifier] = self.id
                 object.updateAttributes(attr, callback)
               })
             }
+          }
         })
       }
       
@@ -263,13 +268,15 @@ SequelizeTable = function(sequelize, tableName, attributes) {
       })
       
       table.prototype[assocName] = function(callback) {
-        var whereConditions = ["id", this[_table.identifier]].join("=")
-        _table.find({where: whereConditions}, callback)
+        _table.find(this[_table.identifier], callback)
       }
       
       table.prototype[SequelizeHelper.SQL.addPrefix('set', assocName)] = function(object, callback) {
         var attr = {}; attr[object.table.identifier] = object.id
-        this.updateAttributes(attr, callback)
+        var self = this
+        this.updateAttributes(attr, function() {
+          self[assocName](callback)
+        })
       }
       
       return table

test/SequelizeTableTest.js

@@ -132,7 +132,7 @@ module.exports = {
     Day.hasMany('HasManyBlubbs', HasManyBlubb)
     assert.isNotUndefined(new Day({name:''}).HasManyBlubbs)
   },
-  'hasMany findAll => crossAssociated': function(assert, beforeExit) {
+  'hasMany: set association': function(assert, beforeExit) {
     var assoc = null
     var Character = s.define('Character', {})
     var Word = s.define('Word', {})
@@ -166,11 +166,53 @@ module.exports = {
     Day.hasOne('HasOneBlubb', HasOneBlubb)
     assert.isNotUndefined(new Day({name:''}).HasOneBlubb)
   },
+  'hasOne set association': function(assert, beforeExit) {
+    var s2 = new Sequelize('sequelize_test', 'test', 'test', {disableLogging: true})
+    var Task = s2.define('Task', {title: Sequelize.STRING})
+    var Deadline = s2.define('Deadline', {date: Sequelize.DATE})
+    
+    Task.hasOne('deadline', Deadline)
+    Deadline.belongsTo('task', Task)
+
+    var task = new Task({ title:'do smth' })
+    var deadline = new Deadline({date: new Date()})
+    var assertMe = null
+    
+    Sequelize.chainQueries([{sync: s2}, {drop: s2}, {sync: s2}, {save: task}, {save: deadline}], function() {
+      task.setDeadline(deadline, function(_deadline) { assertMe = _deadline })
+    })
+    
+    beforeExit(function() {
+      assert.isNotNull(assertMe)
+      assert.eql(assertMe, deadline)
+    })
+  },
   'belongsTo': function(assert) {
     var BelongsToBlubb = s.define('BelongsToBlubb', {})
     Day.belongsTo('BelongsToBlubb', BelongsToBlubb)
     assert.isNotUndefined(new Day({name:''}).BelongsToBlubb)
   },
+  'belongsTo: set association': function(assert, beforeExit) {
+    var s2 = new Sequelize('sequelize_test', 'test', 'test', {disableLogging: true})
+    var Task = s2.define('Task', {title: Sequelize.STRING})
+    var Deadline = s2.define('Deadline', {date: Sequelize.DATE})
+    
+    Task.hasOne('deadline', Deadline)
+    Deadline.belongsTo('task', Task)
+
+    var task = new Task({ title:'do smth' })
+    var deadline = new Deadline({date: new Date()})
+    var assertMe = null
+    
+    Sequelize.chainQueries([{drop: s2}, {sync: s2}, {save: task}, {save: deadline}], function() {
+      deadline.setTask(task, function(_task) { assertMe = _task })
+    })
+    
+    beforeExit(function() {
+      assert.isNotNull(assertMe)
+      assert.eql(assertMe.id, task.id)
+    })
+  },
   'identifier': function(assert) {
     assert.equal(s.define('Identifier', {}).identifier, 'identifierId')
   },
@@ -195,15 +237,15 @@ module.exports = {
   },
   'updateAttributes should update available attributes': function(assert, beforeExit) {
     var subject = null
-    Day.drop(function() {
-      Day.sync(function() {
+
+    Sequelize.chainQueries([{drop: Day}, {sync: Day}], function() {
       new Day({name:'Monday'}).save(function(day) {
         day.updateAttributes({name: 'Sunday', foo: 'bar'}, function(day) {
           subject = day
         })
       })
     })
-    })
+
     beforeExit(function() {
       assert.equal(subject.name, 'Sunday')
       assert.isUndefined(subject.foo)
@@ -212,8 +254,7 @@ module.exports = {
   'destroy should make the object unavailable': function(assert, beforeExit) {
     var subject = 1
     var UpdateAttributesTest = s.define('UpdateAttributeTest', {name: Sequelize.STRING})
-    UpdateAttributesTest.drop(function() {
-      UpdateAttributesTest.sync(function() {
+    Sequelize.chainQueries([{drop: UpdateAttributesTest}, {sync: UpdateAttributesTest}], function() {
       new UpdateAttributesTest({name:'Monday'}).save(function(day) {
         day.destroy(function() {
           UpdateAttributesTest.find(day.id, function(result) {
@@ -222,7 +263,6 @@ module.exports = {
         })
       })
     })
-    })
     beforeExit(function() {
       assert.isNull(subject)
     })