不要怂,就是干,撸起袖子干!

Commit a8310bf7 by Alexsey Committed by Sushant

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

1 parent f00bd96c
...@@ -1680,8 +1680,9 @@ const QueryGenerator = { ...@@ -1680,8 +1680,9 @@ 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, '->');
......
...@@ -295,7 +295,7 @@ suite(Support.getTestDialectTeaser('SQL'), () => { ...@@ -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] ORDER BY [user].[last_name] ASC;' ') AS [user] LEFT OUTER JOIN [post] AS [POSTS] ON [user].[id_user] = [POSTS].[user_id];'
}); });
const nestedInclude = Model._validateIncludedElements({ const nestedInclude = Model._validateIncludedElements({
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!