Test and fix for NH-3324

Author: hazzik

src/NHibernate.Test/NHSpecificTest/NH3324/ChildEntity.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NHibernate.Test.NHSpecificTest.NH3324
+{
+	internal class ChildEntity
+	{
+		public virtual int? Id { get; set; }
+		public virtual string Name { get; set; }
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH3324/Entity.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+
+namespace NHibernate.Test.NHSpecificTest.NH3324
+{
+	internal class Entity
+	{
+		public Entity()
+		{
+			Children = new List<ChildEntity>();
+		}
+
+		public virtual int? Id { get; set; }
+		public virtual string Name { get; set; }
+		public virtual IList<ChildEntity> Children { get; set; }
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH3324/FixtureByCode.cs

@@ -0,0 +1,111 @@
+using NHibernate.Cfg.MappingSchema;
+using NHibernate.Mapping.ByCode;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH3324
+{
+	public class FixtureByCode : TestCaseMappingByCode
+	{
+		[Test]
+		public void LeftOuterJoin()
+		{
+			using (var session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				const string hql = "FROM Entity e LEFT OUTER JOIN FETCH e.Children";
+
+				var query = session.CreateQuery(hql);
+				var result = query.List(); // does work
+				Assert.That(result, Has.Count.GreaterThan(0));
+			}
+		}
+
+		[Test]
+		public void LeftOuterJoinSetMaxResults()
+		{
+			using (var session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				const string hql = "FROM Entity e LEFT OUTER JOIN FETCH e.Children";
+
+				var query = session.CreateQuery(hql);
+				query.SetMaxResults(5);
+				var result = query.List(); // does not work
+				Assert.That(result, Has.Count.GreaterThan(0));
+			}
+		}
+
+		protected override HbmMapping GetMappings()
+		{
+			var mapper = new ModelMapper();
+
+			mapper.Class<Entity>(rc =>
+				{
+					rc.Id(x => x.Id,
+						  m =>
+							  {
+								  m.Generator(Generators.Identity);
+								  m.Length(4);
+							  });
+					rc.Property(x => x.Name);
+					rc.Bag(x => x.Children,
+						   c =>
+							   {
+								   c.Key(k =>
+									   {
+										   k.Column("EntityId");
+										   k.NotNullable(false);
+										   k.ForeignKey("Id");
+									   });
+								   c.Cascade(Mapping.ByCode.Cascade.All);
+								   c.Table("ChildEntity");
+								   c.Inverse(true);
+							   },
+						   t => t.OneToMany());
+				});
+
+			mapper.Class<ChildEntity>(rc =>
+				{
+					rc.Id(x => x.Id,
+						  m =>
+							  {
+								  m.Generator(Generators.Identity);
+								  m.Length(4);
+							  });
+					rc.Property(x => x.Name);
+				});
+
+			return mapper.CompileMappingForAllExplicitlyAddedEntities();
+		}
+
+		protected override void OnSetUp()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				var e1 = new Entity { Name = "Bob" };
+				e1.Children.Add(new ChildEntity { Name = "Bob's Child" });
+				session.Save(e1);
+
+				var e2 = new Entity { Name = "Sally" };
+				e2.Children.Add(new ChildEntity { Name = "Sally's Child" });
+				session.Save(e2);
+
+				session.Flush();
+				transaction.Commit();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				session.Delete("from System.Object");
+
+				session.Flush();
+				transaction.Commit();
+			}
+		}
+	}
+}

src/NHibernate.Test/NHibernate.Test.csproj

@@ -670,6 +670,9 @@
     <Compile Include="NHSpecificTest\NH2297\Entity.cs" />
     <Compile Include="NHSpecificTest\NH2297\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH2297\InvalidCustomCompositeUserTypeBase.cs" />
+    <Compile Include="NHSpecificTest\NH3324\ChildEntity.cs" />
+    <Compile Include="NHSpecificTest\NH3324\Entity.cs" />
+    <Compile Include="NHSpecificTest\NH3324\FixtureByCode.cs" />
     <Compile Include="NHSpecificTest\NH3374\Document.cs" />
     <Compile Include="NHSpecificTest\NH3374\FixtureByCode.cs" />
     <Compile Include="NHSpecificTest\NH2042\Model.cs" />
@@ -2873,6 +2876,7 @@
     <EmbeddedResource Include="NHSpecificTest\NH1291AnonExample\Mappings.hbm.xml" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="NHSpecificTest\NH3324\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2297\MappingsNames.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2297\MappingsTypes.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2042\Mappings.hbm.xml" />

src/NHibernate/Engine/QueryParameters.cs

@@ -205,8 +205,8 @@ public QueryParameters CreateCopyUsing(RowSelection selection)
 			                               selection, IsReadOnlyInitialized, readOnly, Cacheable, CacheRegion, Comment, CollectionKeys,
 			                               OptionalObject, OptionalEntityName, OptionalId, ResultTransformer)
 			           {
-			           	ProcessedSql = ProcessedSql,
-			           	ProcessedSqlParameters = ProcessedSqlParameters.ToList()
+			           	ProcessedSql = ProcessedSql,
+			            ProcessedSqlParameters = ProcessedSqlParameters != null ? ProcessedSqlParameters.ToList() : null
 			           };
 			return copy;
 		}
@@ -216,4 +216,4 @@ public bool IsReadOnly(ISessionImplementor session)
 			return IsReadOnlyInitialized ? ReadOnly : session.PersistenceContext.DefaultReadOnly;
 		}
 	}
-}
+}