Merge pull request #3784 from pmhpereira/master

[MSSQL] Eliminate duplicate ORDER BY statements in select queries

lib/dialects/mssql/query-generator.js

@@ -576,7 +576,8 @@ module.exports = (function() {
 
       if (options.limit || options.offset) {
         if (!options.order || (options.include && !subQueryOrder.length)) {
-          fragment += ' ORDER BY ' + this.quoteIdentifier(model.primaryKeyAttribute);
+          fragment += (options.order && !isSubQuery) ? ', ' : ' ORDER BY ';
+          fragment += this.quoteIdentifier(model.primaryKeyAttribute);
         }
 
         if (options.offset || options.limit) {

test/integration/model/findAll.test.js

@@ -562,6 +562,19 @@ describe(Support.getTestDialectTeaser('Model'), function() {
             expect(tasks[0].Worker.name).to.equal('worker');
           });
         });
+
+        it('returns the associated worker via task.worker, using limit and sort', function() {
+          return this.Task.findAll({
+            where: { title: 'homework' },
+            include: [this.Worker],
+            limit: 1,
+            order: 'title DESC'
+          }).then(function(tasks) {
+            expect(tasks).to.exist;
+            expect(tasks[0].Worker).to.exist;
+            expect(tasks[0].Worker.name).to.equal('worker');
+          });
+        });
       });
 
       describe('hasOne', function() {