cleaning up

lib/associations/has-one.js

@@ -26,9 +26,7 @@ module.exports = (function() {
     var newAttributes = {}
 
     this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.source.tableName) + "Id", this.options.underscored)
-    
     newAttributes[this.identifier] = { type: DataTypes.INTEGER }
-    
     Utils._.extend(this.target.rawAttributes, newAttributes)
 
     return this
@@ -36,9 +34,14 @@ module.exports = (function() {
 
   HasOne.prototype.injectGetter = function(obj) {
     var self = this
+
+    obj[this.accessors.get] = function() {
+      var id    = obj.id
         , where = {}
 
       where[self.identifier] = id
+      return self.target.find({where: where})
+    }
 
     return this
   }
@@ -50,11 +53,11 @@ module.exports = (function() {
       var customEventEmitter = new Utils.CustomEventEmitter(function() {
         obj[self.accessors.get]().success(function(oldObj) {
           if(oldObj) {
-            oldObj = Utils.setAttributes(oldObj, self.identifier, self.options.omitNull ? '' : null)
+            oldObj[self.identifier] = self.options.omitNull ? '' : null;
             oldObj.save()
           }
 
-          associatedObject = Utils.setAttributes(associatedObject, self.identifier, obj)
+          associatedObject[self.identifier] = obj.id
           associatedObject.save()
           .success(function() { customEventEmitter.emit('success', associatedObject) })
           .error(function(err) { customEventEmitter.emit('failure', err) })