Merge pull request #4278 from Americas/master

groupJoinData checks UniqueKeys if no PrimaryKey is set

lib/dialects/abstract/query.js

@@ -149,7 +149,21 @@ var groupJoinData = function(rows, includeOptions, options) {
       }
       return keyPrefixMemo[key];
     }
+    , getUniqueKeyAttributes = function (model) {
+        var uniqueKeyAttributes = Utils._.chain(model.uniqueKeys);
+        uniqueKeyAttributes = uniqueKeyAttributes
+        .result(uniqueKeyAttributes.findKey() + '.fields')
+        .map(function(field){
+          return Utils._.findKey(model.attributes, function(chr) {
+            return chr.field === field;
+          });
+        })
+        .value();
+
+        return uniqueKeyAttributes;
+    }
     , primaryKeyAttributes
+    , uniqueKeyAttributes
     , prefix;
 
   for (rowsI = 0; rowsI < rowsLength; rowsI++) {
@@ -166,14 +180,21 @@ var groupJoinData = function(rows, includeOptions, options) {
 
       // Compute top level hash key (this is usually just the primary key values)
       $length = includeOptions.model.primaryKeyAttributes.length;
+      topHash = '';
       if ($length === 1) {
         topHash = row[includeOptions.model.primaryKeyAttributes[0]];
-      } else {
-        topHash = '';
+      }
+      else if ($length > 1) {
         for ($i = 0; $i < $length; $i++) {
           topHash += row[includeOptions.model.primaryKeyAttributes[$i]];
         }
       }
+      else if (!Utils._.isEmpty(includeOptions.model.uniqueKeys)) {
+        uniqueKeyAttributes = getUniqueKeyAttributes(includeOptions.model);
+        for ($i = 0; $i < uniqueKeyAttributes.length; $i++) {
+          topHash += row[uniqueKeyAttributes[$i]];
+        }
+      }
     }
 
     topValues = values = {};
@@ -197,7 +218,6 @@ var groupJoinData = function(rows, includeOptions, options) {
           $keyPrefix.forEach(buildIncludeMap);
         }
       }
-
       // End of key set
       if ($prevKeyPrefix !== undefined && $prevKeyPrefix !== $keyPrefix) {
         if (checkExisting) {
@@ -212,14 +232,21 @@ var groupJoinData = function(rows, includeOptions, options) {
               prefix = $parent ? $parent+'.'+$prevKeyPrefix[i] : $prevKeyPrefix[i];
               primaryKeyAttributes = includeMap[prefix].model.primaryKeyAttributes;
               $length = primaryKeyAttributes.length;
+              itemHash = prefix;
               if ($length === 1) {
-                itemHash = prefix+row[prefix+'.'+primaryKeyAttributes[0]];
-              } else {
-                itemHash = prefix;
+                itemHash += row[prefix+'.'+primaryKeyAttributes[0]];
+              }
+              else if ($length > 1) {
                 for ($i = 0; $i < $length; $i++) {
                   itemHash += row[prefix+'.'+primaryKeyAttributes[$i]];
                 }
               }
+              else if (!Utils._.isEmpty(includeMap[prefix].model.uniqueKeys)) {
+                uniqueKeyAttributes = getUniqueKeyAttributes(includeMap[prefix].model);
+                for ($i = 0; $i < uniqueKeyAttributes.length; $i++) {
+                  itemHash += row[prefix+'.'+uniqueKeyAttributes[$i]];
+                }
+              }
               if (!parentHash) {
                 parentHash = topHash;
               }
@@ -292,14 +319,21 @@ var groupJoinData = function(rows, includeOptions, options) {
           prefix = $parent ? $parent+'.'+$prevKeyPrefix[i] : $prevKeyPrefix[i];
           primaryKeyAttributes = includeMap[prefix].model.primaryKeyAttributes;
           $length = primaryKeyAttributes.length;
+          itemHash = prefix;
           if ($length === 1) {
-            itemHash = prefix+row[prefix+'.'+primaryKeyAttributes[0]];
-          } else {
-            itemHash = prefix;
+            itemHash += row[prefix+'.'+primaryKeyAttributes[0]];
+          }
+          else if ($length > 0) {
             for ($i = 0; $i < $length; $i++) {
               itemHash += row[prefix+'.'+primaryKeyAttributes[$i]];
             }
           }
+          else if (!Utils._.isEmpty(includeMap[prefix].model.uniqueKeys)) {
+            uniqueKeyAttributes = getUniqueKeyAttributes(includeMap[prefix].model);
+            for ($i = 0; $i < uniqueKeyAttributes.length; $i++) {
+              itemHash += row[prefix+'.'+uniqueKeyAttributes[$i]];
+            }
+          }
           if (!parentHash) {
             parentHash = topHash;
           }