getAssociation finds by alias if provided

lib/associations/mixin.js

@@ -59,36 +59,32 @@ Mixin.hasMany = function(associatedDAOFactory, options) {
   return this
 }
 
-Mixin.getAssociation = function(target) {
-  var result = null
-
+Mixin.getAssociation = function(target, alias) {
   for (var associationName in this.associations) {
     if (this.associations.hasOwnProperty(associationName)) {
       var association = this.associations[associationName]
 
-      if (!result && (association.target === target)) {
-        result = association
+      if (association.target === target && (alias === undefined ? !association.isAliased : association.as === alias)) {
+        return association
       }
     }
   }
 
-  return result
+  return null
 }
 
 Mixin.getAssociationByAlias = function(alias) {
-  var result = null
-
   for (var associationName in this.associations) {
     if (this.associations.hasOwnProperty(associationName)) {
       var association = this.associations[associationName]
 
-      if (!result && (association.options.as === alias)) {
-        result = association
+      if (association.as === alias) {
+        return association
       }
     }
   }
 
-  return result
+  return null
 }
 
 /* example for instance methods: