Use inner joins for inner key associations

Author: maca88

src/NHibernate.Test/Async/Linq/LinqQuerySamples.cs

@@ -1026,7 +1026,9 @@ join o in db.Orders on
 
 				var sql = sqlSpy.GetWholeLog();
 				Assert.That(sql, Does.Contain(useCrossJoin ? "cross join" : "inner join"));
-				Assert.That(GetTotalOccurrences(sql, "left outer join"), Is.EqualTo(1));
+				Assert.That(GetTotalOccurrences(sql, "left outer join"), Is.EqualTo(0));
+				Assert.That(GetTotalOccurrences(sql, "inner join"), Is.EqualTo(useCrossJoin ? 1 : 2));
+				Assert.That(GetTotalOccurrences(sql, "cross join"), Is.EqualTo(useCrossJoin ? 1 : 0));
 			}
 		}
 

src/NHibernate.Test/Linq/LinqQuerySamples.cs

@@ -1570,7 +1570,9 @@ join o in db.Orders on
 
 				var sql = sqlSpy.GetWholeLog();
 				Assert.That(sql, Does.Contain(useCrossJoin ? "cross join" : "inner join"));
-				Assert.That(GetTotalOccurrences(sql, "left outer join"), Is.EqualTo(1));
+				Assert.That(GetTotalOccurrences(sql, "left outer join"), Is.EqualTo(0));
+				Assert.That(GetTotalOccurrences(sql, "inner join"), Is.EqualTo(useCrossJoin ? 1 : 2));
+				Assert.That(GetTotalOccurrences(sql, "cross join"), Is.EqualTo(useCrossJoin ? 1 : 0));
 			}
 		}
 

src/NHibernate/Linq/ReWriters/AddJoinsReWriter.cs

@@ -96,6 +96,12 @@ public bool IsIdentifier(System.Type type, string propertyName)
 		private void AddJoin(QueryModel queryModel, NhJoinClause joinClause)
 		{
 			joinClause.ParentJoinClause = _currentJoin;
+			if (_currentJoin != null)
+			{
+				// Match the parent join type
+				joinClause.MakeInner();
+			}
+
 			queryModel.BodyClauses.Add(joinClause);
 		}
 	}