cleaning up

lib/associations/has-one.js

@@ -23,18 +23,11 @@ module.exports = (function() {
 
 
   // the id is in the target table
   // the id is in the target table
   HasOne.prototype.injectAttributes = function() {
   HasOne.prototype.injectAttributes = function() {
-    var newAttributes = {},
-      self = this
+    var newAttributes = {}
 
 
     this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.source.tableName) + "Id", this.options.underscored)
     this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.source.tableName) + "Id", this.options.underscored)
     
     
-    if(Utils.isHash(this.identifier)) {
-       Utils._.each(this.identifier, function(elem, key) {
-        newAttributes[key] = self.identifier[key].type || DataTypes.INTEGER
-      })
-    } else {
-      newAttributes[this.identifier] = { type: DataTypes.INTEGER }
-    }
+    newAttributes[this.identifier] = { type: DataTypes.INTEGER }
     
     
     Utils._.extend(this.target.rawAttributes, newAttributes)
     Utils._.extend(this.target.rawAttributes, newAttributes)
     
     
@@ -43,13 +36,9 @@ module.exports = (function() {
 
 
   HasOne.prototype.injectGetter = function(obj) {
   HasOne.prototype.injectGetter = function(obj) {
     var self = this
     var self = this
-
-    obj[this.accessors.get] = function() {
-      var id    = obj.id
-        , where = Utils.setAttributes({}, self.identifier, obj)
-      
-      return self.target.find({where: where})
-    }
+	 , where = {}
+	 
+    where[self.identifier] = id
 
 
     return this
     return this
   }
   }