Skip to content

fix(select): do not force set subQuery to false #13490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sdepold merged 6 commits into from
Oct 23, 2021
Merged

fix(select): do not force set subQuery to false #13490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
df7f152
fix(select): do not force set subQuery to false
Sep 10, 2021
58f213f
test: make include (subQuery alias) tests dry
Sep 13, 2021
d0dabaf
Merge branch 'main' into fix/subQuery-select-with-multi-include
Keimeno Oct 10, 2021
8ec8123
Merge branch 'main' into fix/subQuery-select-with-multi-include
sdepold Oct 17, 2021
97c9c7f
Merge branch 'main' into fix/subQuery-select-with-multi-include
sdepold Oct 18, 2021
ed9e093
Merge branch 'main' into fix/subQuery-select-with-multi-include
sdepold Oct 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions lib/model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ class Model {

if (include.subQuery !== false && options.hasDuplicating && options.topLimit) {
if (include.duplicating) {
include.subQuery = false;
include.subQuery = include.subQuery || false;
include.subQueryFilter = include.hasRequired;
} else {
include.subQuery = include.hasRequired;
Expand All @@ -538,7 +538,6 @@ class Model {
include.subQuery = include.subQuery || false;
if (include.duplicating) {
include.subQueryFilter = include.subQuery;
include.subQuery = false;
} else {
include.subQueryFilter = false;
include.subQuery = include.subQuery || include.hasParentRequired && include.hasRequired && !include.separate;
Expand Down
112 changes: 95 additions & 17 deletions test/unit/sql/select.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ describe(Support.getTestDialectTeaser('SQL'), () => {
});
});

it('include (subQuery alias)', () => {
describe('include (subQuery alias)', () => {
const User = Support.sequelize.define('User', {
name: DataTypes.STRING,
age: DataTypes.INTEGER
Expand All @@ -466,29 +466,107 @@ describe(Support.getTestDialectTeaser('SQL'), () => {

User.Posts = User.hasMany(Post, { foreignKey: 'user_id', as: 'postaliasname' });

expectsql(sql.selectQuery('User', {
table: User.getTableName(),
model: User,
attributes: ['name', 'age'],
it('w/o filters', () => {
expectsql(sql.selectQuery('User', {
table: User.getTableName(),
model: User,
attributes: ['name', 'age'],
include: Model._validateIncludedElements({
include: [{
attributes: ['title'],
association: User.Posts,
subQuery: true,
required: true
}],
as: 'User'
}).include,
subQuery: true
}, User), {
default: 'SELECT [User].* FROM ' +
'(SELECT [User].[name], [User].[age], [User].[id] AS [id], [postaliasname].[id] AS [postaliasname.id], [postaliasname].[title] AS [postaliasname.title] FROM [User] AS [User] ' +
'INNER JOIN [Post] AS [postaliasname] ON [User].[id] = [postaliasname].[user_id] ' +
`WHERE ( SELECT [user_id] FROM [Post] AS [postaliasname] WHERE ([postaliasname].[user_id] = [User].[id])${sql.addLimitAndOffset({ limit: 1, tableAs: 'postaliasname' }, User)} ) IS NOT NULL) AS [User];`
});
});

it('w/ nested column filter', () => {
expectsql(sql.selectQuery('User', {
table: User.getTableName(),
model: User,
attributes: ['name', 'age'],
where: { '$postaliasname.title$': 'test' },
include: Model._validateIncludedElements({
include: [{
attributes: ['title'],
association: User.Posts,
subQuery: true,
required: true
}],
as: 'User'
}).include,
subQuery: true
}, User), {
default: 'SELECT [User].* FROM ' +
'(SELECT [User].[name], [User].[age], [User].[id] AS [id], [postaliasname].[id] AS [postaliasname.id], [postaliasname].[title] AS [postaliasname.title] FROM [User] AS [User] ' +
'INNER JOIN [Post] AS [postaliasname] ON [User].[id] = [postaliasname].[user_id] ' +
`WHERE [postaliasname].[title] = ${sql.escape('test')} AND ( SELECT [user_id] FROM [Post] AS [postaliasname] WHERE ([postaliasname].[user_id] = [User].[id])${sql.addLimitAndOffset({ limit: 1, tableAs: 'postaliasname' }, User)} ) IS NOT NULL) AS [User];`
});
});
});

it('include w/ subQuery + nested filter + paging', () => {
const User = Support.sequelize.define('User', {
scopeId: DataTypes.INTEGER
});

const Company = Support.sequelize.define('Company', {
name: DataTypes.STRING,
public: DataTypes.BOOLEAN,
scopeId: DataTypes.INTEGER
});

const Profession = Support.sequelize.define('Profession', {
name: DataTypes.STRING,
scopeId: DataTypes.INTEGER
});

User.Company = User.belongsTo(Company, { foreignKey: 'companyId' });
User.Profession = User.belongsTo(Profession, { foreignKey: 'professionId' });
Company.Users = Company.hasMany(User, { as: 'Users', foreignKey: 'companyId' });
Profession.Users = Profession.hasMany(User, { as: 'Users', foreignKey: 'professionId' });

expectsql(sql.selectQuery('Company', {
table: Company.getTableName(),
model: Company,
attributes: ['name', 'public'],
where: { '$Users.Profession.name$': 'test', [Op.and]: { scopeId: [42] } },
include: Model._validateIncludedElements({
include: [{
attributes: ['title'],
association: User.Posts,
association: Company.Users,
attributes: [],
include: [{
association: User.Profession,
attributes: [],
required: true
}],
subQuery: true,
required: true
}],
as: 'User'
model: Company
}).include,
limit: 5,
offset: 0,
subQuery: true
}, User), {
default: 'SELECT [User].*, [postaliasname].[id] AS [postaliasname.id], [postaliasname].[title] AS [postaliasname.title] FROM ' +
'(SELECT [User].[name], [User].[age], [User].[id] AS [id] FROM [User] AS [User] ' +
'WHERE ( SELECT [user_id] FROM [Post] AS [postaliasname] WHERE ([postaliasname].[user_id] = [User].[id]) LIMIT 1 ) IS NOT NULL) AS [User] ' +
'INNER JOIN [Post] AS [postaliasname] ON [User].[id] = [postaliasname].[user_id];',
mssql: 'SELECT [User].*, [postaliasname].[id] AS [postaliasname.id], [postaliasname].[title] AS [postaliasname.title] FROM ' +
'(SELECT [User].[name], [User].[age], [User].[id] AS [id] FROM [User] AS [User] ' +
'WHERE ( SELECT [user_id] FROM [Post] AS [postaliasname] WHERE ([postaliasname].[user_id] = [User].[id]) ORDER BY [postaliasname].[id] OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY ) IS NOT NULL) AS [User] ' +
'INNER JOIN [Post] AS [postaliasname] ON [User].[id] = [postaliasname].[user_id];'
}, Company), {
default: 'SELECT [Company].* FROM (' +
'SELECT [Company].[name], [Company].[public], [Company].[id] AS [id] FROM [Company] AS [Company] ' +
'INNER JOIN [Users] AS [Users] ON [Company].[id] = [Users].[companyId] ' +
'INNER JOIN [Professions] AS [Users->Profession] ON [Users].[professionId] = [Users->Profession].[id] ' +
`WHERE ([Company].[scopeId] IN (42)) AND [Users->Profession].[name] = ${sql.escape('test')} AND ( ` +
'SELECT [Users].[companyId] FROM [Users] AS [Users] ' +
'INNER JOIN [Professions] AS [Profession] ON [Users].[professionId] = [Profession].[id] ' +
`WHERE ([Users].[companyId] = [Company].[id])${sql.addLimitAndOffset({ limit: 1, tableAs: 'Users' }, User)} ` +
`) IS NOT NULL${sql.addLimitAndOffset({ limit: 5, offset: 0, tableAs: 'Company' }, Company)}) AS [Company];`
});
});

Expand Down