Revert "fix(abstract/querygenerator): remove duplicated order expression on outer query (#8278)"

This reverts commit a8310bf7.

lib/dialects/abstract/query-generator.js

@@ -1680,9 +1680,8 @@ const QueryGenerator = {
           && !(typeof order[0] === 'string' && model && model.associations !== undefined && model.associations[order[0]])
           && !(typeof order[0] === 'string' && model && model.associations !== undefined && model.associations[order[0]])
         ) {
         ) {
           subQueryOrder.push(this.quote(order, model, '->'));
           subQueryOrder.push(this.quote(order, model, '->'));
-        } else {
-          mainQueryOrder.push(this.quote(order, model, '->'));
         }
         }
+        mainQueryOrder.push(this.quote(order, model, '->'));
       }
       }
     } else if (options.order instanceof Utils.SequelizeMethod) {
     } else if (options.order instanceof Utils.SequelizeMethod) {
       const sql = this.quote(options.order, model, '->');
       const sql = this.quote(options.order, model, '->');

test/unit/sql/select.test.js

@@ -295,7 +295,7 @@ suite(Support.getTestDialectTeaser('SQL'), () => {
         default: 'SELECT [user].*, [POSTS].[id] AS [POSTS.id], [POSTS].[title] AS [POSTS.title] FROM (' +
         default: 'SELECT [user].*, [POSTS].[id] AS [POSTS.id], [POSTS].[title] AS [POSTS.title] FROM (' +
                        'SELECT [user].[id_user] AS [id], [user].[email], [user].[first_name] AS [firstName], [user].[last_name] AS [lastName] FROM [users] AS [user] ORDER BY [user].[last_name] ASC' +
                        'SELECT [user].[id_user] AS [id], [user].[email], [user].[first_name] AS [firstName], [user].[last_name] AS [lastName] FROM [users] AS [user] ORDER BY [user].[last_name] ASC' +
                        sql.addLimitAndOffset({ limit: 30, offset:10, order: [['`user`.`last_name`', 'ASC']]}) +
                        sql.addLimitAndOffset({ limit: 30, offset:10, order: [['`user`.`last_name`', 'ASC']]}) +
-                   ') AS [user] LEFT OUTER JOIN [post] AS [POSTS] ON [user].[id_user] = [POSTS].[user_id];'
+                   ') AS [user] LEFT OUTER JOIN [post] AS [POSTS] ON [user].[id_user] = [POSTS].[user_id] ORDER BY [user].[last_name] ASC;'
       });
       });
 
 
       const nestedInclude = Model._validateIncludedElements({
       const nestedInclude = Model._validateIncludedElements({