Skip to content

Fix duplicate join for collection #2890

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
merged 4 commits into from
Aug 12, 2021
Merged

Fix duplicate join for collection #2890

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7f626e3
Fix duplicate join for collection
bahusoid Aug 10, 2021
a03d8ba
Remove unnecessary change (AddQuerySpaces is called later anyway)
bahusoid Aug 10, 2021
3e2be62
Merge branch '5.3.x' into gh1962x
fredericDelaporte Aug 11, 2021
10d41fc
Merge branch '5.3.x' into gh1962x
fredericDelaporte Aug 11, 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
2 changes: 0 additions & 2 deletions src/NHibernate.Test/Async/NHSpecificTest/GH1962/Fixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,9 @@ namespace NHibernate.Test.NHSpecificTest.GH1962
public class FixtureAsync : BugTestCase
{
[Test]
[KnownBug("#1962")]
public async Task LinqShouldBeValidAsync()
{
using (var session = OpenSession())
using (session.BeginTransaction())
{
var result =
await (session
Expand Down
2 changes: 0 additions & 2 deletions src/NHibernate.Test/NHSpecificTest/GH1962/Fixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@ namespace NHibernate.Test.NHSpecificTest.GH1962
public class Fixture : BugTestCase
{
[Test]
[KnownBug("#1962")]
public void LinqShouldBeValid()
{
using (var session = OpenSession())
using (session.BeginTransaction())
{
var result =
session
Expand Down
3 changes: 2 additions & 1 deletion src/NHibernate/Hql/Ast/ANTLR/Tree/FromElementFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,9 +359,10 @@ private FromElement CreateEntityAssociation(
}

elem = CreateManyToMany(role, associatedEntityName, roleAlias, entityPersister, (EntityType)_queryableCollection.ElementType, joinType);
_fromClause.Walker.AddQuerySpaces(_queryableCollection.CollectionSpaces);
}
elem.CollectionTableAlias = roleAlias;
_fromClause.Walker.AddQuerySpaces(_queryableCollection.CollectionSpaces);
_fromClause.AddCollectionJoinFromElementByPath(_path, elem);
return elem;
}

Expand Down