Merge pull request #1410 from ruifortes/master

fix adding duplicate PK attributes in select query

lib/dialects/abstract/query-generator.js

@@ -536,7 +536,15 @@ module.exports = (function() {
       }.bind(this)).join(", ")
       }.bind(this)).join(", ")
 
 
       if (subQuery && mainAttributes) {
       if (subQuery && mainAttributes) {
-        mainAttributes = mainAttributes.concat(factory.hasPrimaryKeys ? factory.primaryKeyAttributes : ['id'])
+        if (factory.hasPrimaryKeys) {
+          factory.primaryKeyAttributes.forEach(function(keyAtt){
+            if(mainAttributes.indexOf(keyAtt) == -1){
+              mainAttributes.push(keyAtt)
+            }
+          })
+        } else {
+          mainAttributes.push("id")
+        }          
       }
       }
 
 
       // Escape attributes
       // Escape attributes