merge

lib/associations/belongs-to.js

@@ -28,7 +28,7 @@ module.exports = (function() {
 
     // Sync attributes to DAO proto each time a new assoc is added
     this.target.DAO.prototype.attributes = Object.keys(this.target.DAO.prototype.rawAttributes);
-    
+
     return this
   }
 
@@ -36,9 +36,18 @@ module.exports = (function() {
     var self     = this
       , accessor = Utils._.camelize('get_' + (this.options.as || Utils.singularize(this.target.tableName)))
 
-    obj[accessor] = function() {
+    obj[accessor] = function(params) {
       var id = this[self.identifier]
-      return self.target.find(id)
+
+      if (!Utils._.isUndefined(params)) {
+        if (!Utils._.isUndefined(params.attributes)) {
+          params = Utils._.extend({where: {id:id}}, params)
+        }
+      } else {
+        params = id
+      }
+
+      return self.target.find(params)
     }
 
     return this

lib/associations/has-one.js

@@ -40,12 +40,21 @@ module.exports = (function() {
   HasOne.prototype.injectGetter = function(obj) {
     var self = this
 
-    obj[this.accessors.get] = function() {
+    obj[this.accessors.get] = function(params) {
       var id    = this.id
         , where = {}
 
       where[self.identifier] = id
-      return self.target.find({where: where})
+
+      if (!Utils._.isUndefined(params)) {
+        if (!Utils._.isUndefined(params.attributes)) {
+          params = Utils._.extend({where: where}, params)
+        }
+      } else {
+        params = {where: where}
+      }
+
+      return self.target.find(params)
     }
 
     return this

spec-jasmine/associations/has-many.spec.js

@@ -87,7 +87,11 @@ describe('HasMany', function() {
         user.setTasks([task1, task2]).success(function() {
           user.getTasks().success(function(tasks) {
             expect(tasks.length).toEqual(2)
-            done()
+            user.getTasks({attributes: ['title']}).success(function(tasks) {
+              expect(tasks[0].selectedValues.title).toEqual('task1')
+              expect(tasks[0].selectedValues.id).toEqual(null)
+              done()
+            })
           })
         })
       })

spec-jasmine/associations/has-one.spec.js

@@ -88,7 +88,11 @@ describe('HasOne', function() {
       user.setTask(task).on('success', function() {
         user.getTask().on('success', function(task2) {
           expect(task.title).toEqual(task2.title)
-          done()
+          user.getTask({attributes: ['title']}).on('success', function(task2) {
+            expect(task2.selectedValues.title).toEqual('snafu')
+            expect(task2.selectedValues.id).toEqual(null)
+            done()
+          })
         })
       })
     })