reuse existing DAO.identifiers

lib/dialects/abstract/query.js

@@ -284,14 +284,14 @@ module.exports = (function() {
 
     associationData.forEach(function(data) {
       var daoInstance = associatedDaoFactory.build(data, { isNewRecord: false })
-        , identifier = associatedDaoFactory.hasPrimaryKeys ? Utils.firstKeyOfHash(associatedDaoFactory.primaryKeys) : 'id'
+        , isEmpty = ! Utils.firstValueOfHash(daoInstance.identifiers)
 
       if (['BelongsTo', 'HasOne'].indexOf(association.associationType) > -1) {
         accessor = Utils.singularize(accessor)
-        dao[accessor] = daoInstance[identifier] ? daoInstance : null
+        dao[accessor] = isEmpty ? null : daoInstance
       } else {
         dao[accessor] = dao[accessor] || []
-        if (daoInstance[identifier])
+        if (! isEmpty)
           dao[accessor].push(daoInstance)
       }
     })

lib/utils.js

@@ -149,10 +149,10 @@ var Utils = module.exports = {
     }
   },
 
-  firstKeyOfHash: function(obj) {
+  firstValueOfHash: function(obj) {
     for (var key in obj) {
       if (obj.hasOwnProperty(key))
-        return key
+        return obj[key]
     }
     return null
   },