fix(include): hasMany.separate should use foreign key field for grouped limit an…

…d only apply grouped limit if more than one instance being requested

lib/associations/has-many.js

@@ -283,10 +283,10 @@ HasMany.prototype.get = function(instances, options) {
       return instance.get(association.source.primaryKeyAttribute, {raw: true});
       return instance.get(association.source.primaryKeyAttribute, {raw: true});
     });
     });
 
 
-    if (options.limit) {
+    if (options.limit && instances.length > 1) {
       options.groupedLimit = {
       options.groupedLimit = {
         limit: options.limit,
         limit: options.limit,
-        on: association.foreignKey,
+        on: association.foreignKeyField,
         values: values
         values: values
       };
       };
 
 

test/integration/include/seperate.test.js

@@ -124,10 +124,15 @@ if (current.dialect.supports.groupedLimit) {
 
 
       it('should run a hasMany association with limit in a separate query', function () {
       it('should run a hasMany association with limit in a separate query', function () {
         var User = this.sequelize.define('User', {})
         var User = this.sequelize.define('User', {})
-          , Task = this.sequelize.define('Task', {})
+          , Task = this.sequelize.define('Task', {
+              userId: {
+                type: DataTypes.INTEGER,
+                field: 'user_id'
+              }
+            })
           , sqlSpy = sinon.spy();
           , sqlSpy = sinon.spy();
 
 
-        User.Tasks = User.hasMany(Task, {as: 'tasks'});
+        User.Tasks = User.hasMany(Task, {as: 'tasks', foreignKey: 'userId'});
 
 
         return this.sequelize.sync({force: true}).then(function () {
         return this.sequelize.sync({force: true}).then(function () {
           return Promise.join(
           return Promise.join(