Merge branch 'master' into GH-2201

Author: bahusoid

src/NHibernate.Test/NHibernate.Test.csproj

@@ -59,7 +59,7 @@
     <PackageReference Include="Microsoft.Data.SqlClient" Version="3.0.0" />
     <PackageReference Include="System.Data.SQLite.Core" Version="1.0.115.5" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.12" />
-    <PackageReference Include="NSubstitute" Version="4.2.2" />
+    <PackageReference Include="NSubstitute" Version="4.4.0" />
     <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />

src/NHibernate/Hql/Ast/ANTLR/SqlGenerator.cs

@@ -183,8 +183,7 @@ protected virtual void FromFragmentSeparator(IASTNode a)
 				return;
 			}
 
-			var left = (FromElement)a;
-			var right = (FromElement)next;
+			var right = (FromElement) next;
 
 			///////////////////////////////////////////////////////////////////////
 			// HACK ALERT !!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -210,34 +209,14 @@ protected virtual void FromFragmentSeparator(IASTNode a)
 			{
 				return;
 			}
-			if (right.Type == ENTITY_JOIN)
+
+			if (right.JoinSequence?.IsThetaStyle == false && right.JoinSequence.JoinCount != 0)
 			{
 				Out(" ");
 			}
-			else if (right.RealOrigin == left || (right.RealOrigin != null && right.RealOrigin == left.RealOrigin))
-			{
-				// right represents a joins originating from left; or
-				// both right and left reprersent joins originating from the same FromElement
-				if (right.JoinSequence != null && right.JoinSequence.IsThetaStyle)
-				{
-					Out(", ");
-				}
-				else
-				{
-					Out(" ");
-				}
-			}
 			else
 			{
-				if (right.JoinSequence?.IsThetaStyle == false && right.JoinSequence.JoinCount != 0)
-				{
-					Out(" ");
-				}
-				else
-				{
-					// these are just two unrelated table references
-					Out(", ");
-				}
+				Out(", ");
 			}
 		}