provide subquery flag that will turn off subquery logic regardless, closes #1756

lib/dialects/abstract/query-generator.js

@@ -702,7 +702,7 @@ module.exports = (function() {
         , mainAttributes = options.attributes && options.attributes.slice(0)
         , mainAttributes = options.attributes && options.attributes.slice(0)
         , mainJoinQueries = []
         , mainJoinQueries = []
         // We'll use a subquery if we have hasMany associations and a limit and a filtered/required association
         // We'll use a subquery if we have hasMany associations and a limit and a filtered/required association
-        , subQuery = limit && (options.hasIncludeWhere || options.hasIncludeRequired || options.hasMultiAssociation)
+        , subQuery = limit && (options.hasIncludeWhere || options.hasIncludeRequired || options.hasMultiAssociation) && options.subQuery !== false
         , subQueryItems = []
         , subQueryItems = []
         , subQueryAttributes = null
         , subQueryAttributes = null
         , subJoinQueries = []
         , subJoinQueries = []

lib/query-interface.js

@@ -575,6 +575,7 @@ module.exports = (function() {
     }
     }
 
 
     options.lock = queryOptions.lock;
     options.lock = queryOptions.lock;
+    options.subQuery = queryOptions.subQuery;
 
 
     var sql = this.QueryGenerator.selectQuery(tableName, options, model);
     var sql = this.QueryGenerator.selectQuery(tableName, options, model);
     queryOptions = Utils._.extend({}, queryOptions, {
     queryOptions = Utils._.extend({}, queryOptions, {