Fix

bahusoid · bahusoid · commit b33095eaece8 · 2023-06-12T11:37:02.000+03:00
diff --git a/src/NHibernate/Loader/JoinWalker.cs b/src/NHibernate/Loader/JoinWalker.cs
@@ -192,7 +192,15 @@ private void AddAssociationToJoinTree(IAssociationType type, string[] aliasedLhs
 
 			if (qc != null)
 			{
-				_joinQueue.Enqueue(new CollectionJoinQueueEntry(qc, subalias, path, pathAlias));
+				var collection = new CollectionJoinQueueEntry(qc, subalias, path, pathAlias);
+				// Many-to-Many element entity join needs to be added right after collection bridge table
+				// (see IsManyToManyWith, ManyToManySelectFragment, IsManyToManyRoot usages)
+				if (qc.IsManyToMany)
+				{
+					collection.Walk(this);
+					return;
+				}
+				_joinQueue.Enqueue(collection);
 			}
 			else if (joinable is IOuterJoinLoadable jl)
 			{

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,15 @@ private void AddAssociationToJoinTree(IAssociationType type, string[] aliasedLhs`
`192`	`192`
`193`	`193`	`if (qc != null)`
`194`	`194`	`{`
`195`		`- _joinQueue.Enqueue(new CollectionJoinQueueEntry(qc, subalias, path, pathAlias));`
	`195`	`+ var collection = new CollectionJoinQueueEntry(qc, subalias, path, pathAlias);`
	`196`	`+ // Many-to-Many element entity join needs to be added right after collection bridge table`
	`197`	`+ // (see IsManyToManyWith, ManyToManySelectFragment, IsManyToManyRoot usages)`
	`198`	`+ if (qc.IsManyToMany)`
	`199`	`+ {`
	`200`	`+ collection.Walk(this);`
	`201`	`+ return;`
	`202`	`+ }`
	`203`	`+ _joinQueue.Enqueue(collection);`
`196`	`204`	`}`
`197`	`205`	`else if (joinable is IOuterJoinLoadable jl)`
`198`	`206`	`{`