Merge tag '4.0.3.GA'

Author: hazzik

build-common/common.xml

@@ -60,7 +60,7 @@
 		effectively SP0).
 	-->
 
-	<property name="project.version" value="4.0.2.GA" overwrite="false" />
+	<property name="project.version" value="4.0.3.GA" overwrite="false" />
 
 	<!-- This version number should be changed if, but only if, there are incompatible
 	     changes compared to the previous version. -->

lib/teamcity/firebird/NHibernate.Test.last-results.xml

@@ -1,3 +1,14 @@
+Build 4.0.3.GA
+=============================
+
+
+** Bug
+    * [NH-2504] - Can't use Cacheable with Group By
+    * [NH-3457] - TemplatedViolatedConstraintNameExtracter.ExtractUsingTemplate calls Substring with wrong arguments
+    * [NH-3468] - InvalidCastException when deleting entities containing uninitialized lazy components
+    * [NH-3573] - Query cache statistics not updated when using MultiCriteria
+    * [NH-3731] - Unable to serialize session after modifying the index of entities in a list
+
 
 Build 4.0.2.GA
 =============================

lib/teamcity/mysql/NHibernate.Test.last-results.xml

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NHibernate.Test.LazyComponentTest
+{
+	public class Address
+	{
+		public virtual string Country { get; set; }
+		public virtual string City { get; set; }
+	}
+}

lib/teamcity/oracle/NHibernate.Test.last-results.xml

@@ -0,0 +1,101 @@
+using System.Collections;
+using NUnit.Framework;
+
+namespace NHibernate.Test.LazyComponentTest
+{
+	[TestFixture]
+	public class LazyComponentTestFixture : TestCase
+	{
+		protected override IList Mappings
+		{
+			get { return new[] {"LazyComponentTest.Person.hbm.xml"}; }
+		}
+
+		protected override string MappingsAssembly
+		{
+			get { return "NHibernate.Test"; }
+		}
+
+		protected override void OnSetUp()
+		{
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				var person = new Person
+				{
+					Name = "Gabor",
+					Address = new Address
+					{
+						Country = "HUN",
+						City = "Budapest"
+					}
+				};
+				s.Persist(person);
+				t.Commit();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				s.CreateQuery("delete from Person").ExecuteUpdate();
+				t.Commit();
+			}
+		}
+
+		[Test]
+		public void LazyLoadTest()
+		{
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				var p = s.CreateQuery("from Person p where name='Gabor'").UniqueResult<Person>();
+				// make sure component has not been initialized yet
+				Assert.That(NHibernateUtil.IsPropertyInitialized(p, "Address"), Is.False);
+
+				t.Commit();
+			}
+		}
+
+		[Test]
+		public void LazyDeleteTest()
+		{
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				var p = s.CreateQuery("from Person p where name='Gabor'").UniqueResult<Person>();
+				// make sure component has not been initialized yet
+				Assert.That(NHibernateUtil.IsPropertyInitialized(p, "Address"), Is.False);
+				s.Delete(p);
+				t.Commit();
+			}
+		}
+
+		[Test]
+		public void LazyUpdateTest()
+		{
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				var p = s.CreateQuery("from Person p where name='Gabor'").UniqueResult<Person>();
+				// make sure component has not been initialized yet
+				Assert.That(!NHibernateUtil.IsPropertyInitialized(p, "Address"));
+
+				p.Address.City = "Baja";
+				s.Update(p);
+
+				t.Commit();
+			}
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				var p = s.CreateQuery("from Person p where name='Gabor'").UniqueResult<Person>();
+				Assert.That(p.Address.City, Is.EqualTo("Baja"));
+
+				t.Commit();
+			}
+		}
+	}
+}

lib/teamcity/sqlServerCe/NHibernate.Test.last-results.xml

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NHibernate.Test.LazyComponentTest
+{
+	public class Person
+	{
+		public virtual string Name { get; set; }
+		public virtual Address Address { get; set; }
+	}
+}

lib/teamcity/sqlServerOdbc/NHibernate.Test.last-results.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+				   assembly="NHibernate.Test"
+				   namespace="NHibernate.Test.LazyComponentTest">
+
+  <class name="Person">
+    <id name="Name"/>
+    <component name="Address" lazy="true">
+      <property name="Country" />
+      <property name="City" />
+    </component>
+  </class>
+
+</hibernate-mapping>

releasenotes.txt

@@ -114,5 +114,65 @@ public void CacheableRegionBeforeOtherClauses()
             Assert.That(Sfi.Statistics.QueryCachePutCount, Is.EqualTo(2));
             Assert.That(Sfi.Statistics.QueryCacheHitCount, Is.EqualTo(1));
         }
-    }
+
+		[Test]
+		public void GroupByQueryIsCacheable()
+		{
+			Sfi.Statistics.Clear();
+			Sfi.QueryCache.Clear();
+
+			var c = db
+				.Customers
+				.GroupBy(x => x.Address.Country)
+				.Select(x=>x.Key)
+				.Cacheable()
+				.ToList();
+
+			c = db
+				.Customers
+				.GroupBy(x => x.Address.Country)
+				.Select(x => x.Key)
+				.ToList();
+
+			c = db
+				.Customers
+				.GroupBy(x => x.Address.Country)
+				.Select(x => x.Key)
+				.Cacheable()
+				.ToList();
+
+			Assert.That(Sfi.Statistics.QueryExecutionCount, Is.EqualTo(2));
+			Assert.That(Sfi.Statistics.QueryCachePutCount, Is.EqualTo(1));
+			Assert.That(Sfi.Statistics.QueryCacheHitCount, Is.EqualTo(1));
+		}
+
+		[Test]
+		public void GroupByQueryIsCacheable2()
+		{
+			Sfi.Statistics.Clear();
+			Sfi.QueryCache.Clear();
+
+			var c = db
+				.Customers.Cacheable()
+				.GroupBy(x => x.Address.Country)
+				.Select(x => x.Key)
+				.ToList();
+
+			c = db
+				.Customers
+				.GroupBy(x => x.Address.Country)
+				.Select(x => x.Key)
+				.ToList();
+
+			c = db
+				.Customers.Cacheable()
+				.GroupBy(x => x.Address.Country)
+				.Select(x => x.Key)
+				.ToList();
+
+			Assert.That(Sfi.Statistics.QueryExecutionCount, Is.EqualTo(2));
+			Assert.That(Sfi.Statistics.QueryCachePutCount, Is.EqualTo(1));
+			Assert.That(Sfi.Statistics.QueryCacheHitCount, Is.EqualTo(1));
+		}
+	}
 }

src/NHibernate.Test/LazyComponentTest/Address.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+
+namespace NHibernate.Test.NHSpecificTest.NH3731
+{
+	[Serializable]
+	class Parent
+	{
+		public Parent()
+		{
+			ChildrenList = new List<ListChild>();
+			ChildrenMap = new Dictionary<string, MapChild>();
+		}
+
+		public virtual Guid Id { get; set; }
+		public virtual string Name { get; set; }
+		public virtual IList<ListChild> ChildrenList { get; set; }
+		public virtual IDictionary<string, MapChild> ChildrenMap { get; set; }
+	}
+
+	[Serializable]
+	class ListChild
+	{
+		public virtual Guid Id { get; set; }
+		public virtual string Name { get; set; }
+	}
+
+	[Serializable]
+	class MapChild
+	{
+		public virtual Guid Id { get; set; }
+		public virtual string Name { get; set; }
+	}
+}