Fix wrong inner join fetch on not lazy component key-many-to-one property in Criteria (#2513)

Fixes #766

Author: bahusoid

src/NHibernate.Test/Async/NHSpecificTest/NH3813/FixtureByCode.cs

@@ -0,0 +1,189 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by AsyncGenerator.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+
+using System.Collections.Generic;
+using System.Linq;
+using NHibernate.Mapping.ByCode;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH3813
+{
+	using System.Threading.Tasks;
+	[TestFixture]
+	public class KeyManyToOneInnerJoinFetchFixtureAsync : TestCaseMappingByCode
+	{
+		protected override Cfg.MappingSchema.HbmMapping GetMappings()
+		{
+			var mapper = new ModelMapper();
+
+			mapper.Class<FirstTable>(
+				m =>
+				{
+					m.Lazy(false);
+
+					m.Id(
+						i => i.Id,
+						id =>
+						{
+							id.Column("ID");
+							id.Generator(Generators.Identity);
+						});
+					m.Property(x => x.Name);
+
+					m.Bag(
+						b => b.AssociationTableCollection,
+						bm =>
+						{
+							bm.Inverse(true);
+							bm.Key(k => k.Column("FirstTableID"));
+						},
+						mp => mp.OneToMany());
+				});
+
+			mapper.Class<OtherTable>(
+				m =>
+				{
+					m.Lazy(false);
+
+					m.Id(
+						i => i.Id,
+						id =>
+						{
+							id.Column("ID");
+							id.Generator(Generators.Identity);
+						});
+					m.Property(x => x.Name);
+				});
+
+			mapper.Class<AssociationTable>(
+				m =>
+				{
+					m.ComposedId(
+						i =>
+						{
+							i.ManyToOne(c => c.FirstTable, p => { p.Column("FirstTableID"); });
+							i.ManyToOne(c => c.OtherTable, p => { p.Column("OtherTableID"); });
+						});
+					m.Property(x => x.Name);
+				});
+
+			return mapper.CompileMappingForAllExplicitlyAddedEntities();
+		}
+
+		[Test]
+		public async Task FetchQueryDoesNotContainInnerJoinAsync()
+		{
+			using (var logSpy = new SqlLogSpy())
+			using (var session = OpenSession())
+			{
+				var q = await (session.QueryOver<FirstTable>()
+								.Fetch(SelectMode.Fetch, f => f.AssociationTableCollection)
+								.Left.JoinQueryOver(f => f.AssociationTableCollection).ListAsync());
+
+				var sql = logSpy.GetWholeLog();
+				Assert.That(sql, Is.Not.Contains("inner join"));
+			}
+		}
+
+		[Test]
+		public async Task FetchQueryDoesNotContainInnerJoinMultiAsync()
+		{
+			using (var logSpy = new SqlLogSpy())
+			using (var session = OpenSession())
+			{
+				var q = await (session.QueryOver<FirstTable>()
+								.Fetch(SelectMode.Fetch, f => f.AssociationTableCollection)
+								.Left.JoinQueryOver<AssociationTable>(f => f.AssociationTableCollection)
+								.Left.JoinQueryOver(a => a.OtherTable).ListAsync());
+
+				var sql = logSpy.GetWholeLog();
+
+				Assert.That(sql, Does.Not.Contain("inner join"));
+				Assert.That(sql, Does.Match(@"join\s*AssociationTable").IgnoreCase);
+				Assert.That(sql, Does.Match(@"join\s*OtherTable"));
+			}
+		}
+
+		[Test]
+		public async Task FetchLoadsAllRecordsAsync()
+		{
+			IList<FirstTable> result = null;
+
+			using (var session = OpenSession())
+			{
+				// the query should return all records from the table with their collections fetched
+				result = await (session.QueryOver<FirstTable>()
+								.Fetch(SelectMode.Fetch, f => f.AssociationTableCollection)
+								.Left.JoinQueryOver(f => f.AssociationTableCollection)
+								.ListAsync());
+			}
+
+			Assert.AreEqual(2, result.Count, "Query returned wrong number of records.");
+			Assert.IsTrue(result.All(x => NHibernateUtil.IsInitialized(x.AssociationTableCollection)), "Not all collections have been initialized");
+		}
+
+		[Test]
+		public async Task FetchInitializesAllCollectionsAsync()
+		{
+			IList<FirstTable> result = null;
+
+			using (var session = OpenSession())
+			{
+				// load all records
+				result = await (session.QueryOver<FirstTable>()
+								.ListAsync());
+
+				// lazy-load the association collection
+				await (session.QueryOver<FirstTable>()
+						.Fetch(SelectMode.Fetch, f => f.AssociationTableCollection)
+						.Left.JoinQueryOver(f => f.AssociationTableCollection)
+						.ListAsync());
+			}
+
+			Assert.IsTrue(result.All(x => NHibernateUtil.IsInitialized(x.AssociationTableCollection)), "Not all collections have been initialized");
+		}
+
+		protected override void OnSetUp()
+		{
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				// a record that has association records will be loaded regularly
+				var withAssociations = new FirstTable();
+
+				var other1 = new OtherTable();
+				var other2 = new OtherTable();
+
+				var assoc1 = new AssociationTable() {OtherTable = other1, FirstTable = withAssociations};
+				var assoc2 = new AssociationTable() {OtherTable = other2, FirstTable = withAssociations};
+
+				withAssociations.AssociationTableCollection.Add(assoc1);
+				withAssociations.AssociationTableCollection.Add(assoc2);
+				s.Save(withAssociations);
+
+				// a record with no associations will have problems if inner joined to association table
+				var withoutAssociations = new FirstTable();
+				s.Save(withoutAssociations);
+
+				t.Commit();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				s.CreateQuery("delete from System.Object").ExecuteUpdate();
+				t.Commit();
+			}
+		}
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH3813/Entities.cs

@@ -0,0 +1,35 @@
+using System.Collections.Generic;
+
+namespace NHibernate.Test.NHSpecificTest.NH3813
+{
+	public class AssociationTable
+	{
+		public virtual FirstTable FirstTable { get; set; }
+		public virtual OtherTable OtherTable { get; set; }
+		public virtual string Name { get; set; }
+
+		public override bool Equals(object obj)
+		{
+			return base.Equals(obj);
+		}
+
+		public override int GetHashCode()
+		{
+			return base.GetHashCode();
+		}
+	}
+
+	public class FirstTable
+	{
+		public virtual int Id { get; set; }
+		public virtual string Name { get; set; }
+
+		public virtual IList<AssociationTable> AssociationTableCollection { get; set; } = new List<AssociationTable>();
+	}
+
+	public class OtherTable
+	{
+		public virtual int Id { get; set; }
+		public virtual string Name { get; set; }
+	}
+}