Fix bulk insert from children of same parent failure

fix nhibernate#3489
fredericDelaporte · Mar 17, 2024 · cce9059 · cce9059
1 parent 11984a0
commit cce9059
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/NHibernate.Test/Async/BulkManipulation/HQLBulkOperations.cs b/src/NHibernate.Test/Async/BulkManipulation/HQLBulkOperations.cs
@@ -44,7 +44,7 @@ public async Task SimpleDeleteAsync()
 			}
 		}
 
-		[Test, KnownBug("#3489")]
+		[Test]
 		public async Task InsertFromSelectWithMultipleAssociationsAsync()
 		{
 			using var s = OpenSession();

diff --git a/src/NHibernate.Test/BulkManipulation/HQLBulkOperations.cs b/src/NHibernate.Test/BulkManipulation/HQLBulkOperations.cs
@@ -33,7 +33,7 @@ public void SimpleDelete()
 			}
 		}
 
-		[Test, KnownBug("#3489")]
+		[Test]
 		public void InsertFromSelectWithMultipleAssociations()
 		{
 			using var s = OpenSession();

diff --git a/src/NHibernate/Hql/Ast/ANTLR/Tree/SelectClause.cs b/src/NHibernate/Hql/Ast/ANTLR/Tree/SelectClause.cs
@@ -493,10 +493,14 @@ private void RenderNonScalarIdentifiers(
 					continue;
 				}
 
-				var node = (IASTNode) e;
-				if (processedElements.Add(fromElement))
+				var isNewFrom = processedElements.Add(fromElement);
+				if (isNewFrom)
 				{
 					combinedFromElements.Add(fromElement);
+				}
+				var node = (IASTNode) e;
+				if (isNewFrom || node.Type == SqlGenerator.DOT)
+				{
 					RenderNonScalarIdentifiers(fromElement, inheritedExpressions.ContainsKey(e) ? null : e, appender);
 				}
 				else if (!inheritedExpressions.ContainsKey(e) && node.Parent != null)
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,7 +44,7 @@ public async Task SimpleDeleteAsync() @@
     			}
     		}
-    		[Test, KnownBug("#3489")]
+    		[Test]
     		public async Task InsertFromSelectWithMultipleAssociationsAsync()
     		{
     			using var s = OpenSession();
@@ Expand Down @@