Merge branch '4.0.x'

Author: hazzik

build-common/common.xml

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

doc/reference/modules/performance.xml

@@ -1149,7 +1149,7 @@ sessionFactory.EvictCollection("Eg.Cat.Kittens"); //evict all kitten collections
             </para>
 
             <para>
-                one-shot-delete apply to collections mapped <literal>inverse="true"</literal>.
+                Of course, one-shot-delete does not apply to collections mapped <literal>inverse="true"</literal>.
             </para>
 
         </sect2>

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

@@ -1,3 +1,22 @@
+
+Build 4.0.2.GA
+=============================
+
+** Bug
+    * [NH-2779] - Session.Get() can throw InvalidCastException when log-level is set to DEBUG
+    * [NH-2782] - Linq: selecting into a new array doesn't work
+    * [NH-2831] - NH cannot load mapping assembly from GAC 
+    * [NH-3049] - Mapping by code to Field not working
+    * [NH-3222] - NHibernate Futures passes empty tuples to ResultSetTransformer
+    * [NH-3650] - ComponentAsId<T> used more than once, cache first mapping and produces  subsequently a sql select wrong
+    * [NH-3709] - Fix Reference to One Shot Delete and Inverse Collections
+    * [NH-3710] - Use of SetLockMode with DetachedCriteria causes null reference exception
+
+** Task
+    * [NH-3697] - Ignore Firebird in NHSpecificTest.NH1981
+    * [NH-3698] - NHSpecificTest.NH1989 fails for some drivers
+
+
 Build 4.0.1.GA
 =============================
 

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

@@ -103,5 +103,13 @@
 	</log4net>
 
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup>
+	<runtime>
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<dependentAssembly>
+				<assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="neutral"/>
+				<bindingRedirect oldVersion="0.0.0.0-2.6.1.12217" newVersion="2.6.1.12217"/>
+			</dependentAssembly>
+		</assemblyBinding>
+	</runtime>
 
 </configuration>

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

@@ -2983,5 +2983,27 @@ public void IgnoreCase()
 				t.Commit();
 			}
 		}
+
+		[Test]
+		public void CanSetLockModeOnDetachedCriteria()
+		{
+			//NH-3710
+			var dc = DetachedCriteria
+				.For(typeof(Student))
+				.SetLockMode(LockMode.Upgrade);
+
+			using (var session = OpenSession())
+			using (var tx = session.BeginTransaction())
+			{
+				session.Save(new Student { Name = "Ricardo Peres", StudentNumber = 666, CityState = new CityState("Coimbra", "Portugal") });
+				session.Flush();
+
+				var ec = dc.GetExecutableCriteria(session);
+				var countExec = CriteriaTransformer.TransformToRowCount(ec);
+				var countRes = countExec.UniqueResult();
+
+				Assert.AreEqual(countRes, 1);
+			}
+		}
 	}
 }

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

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using NHibernate.DomainModel.Northwind.Entities;
 using NUnit.Framework;
@@ -100,6 +101,32 @@ public void CanSelectPropertiesFromAssociationsIntoObjectArray()
 			Assert.That(result.Length, Is.EqualTo(3));
 			Assert.That(result[1], Is.EqualTo("Admin"));
 			Assert.That(result[2], Is.EqualTo("output"));
+		}
+
+		[Test(Description = "NH-2782")] 
+		public void CanSelectPropertiesIntoObjectArrayInProperty()
+		{
+			var result = db.Users
+				.Select(u => new { Cells = new object[] { u.Id, u.Name, new object[u.Id] } })
+				.First();
+
+			var cells = result.Cells;
+			Assert.That(cells.Length, Is.EqualTo(3));
+			Assert.That(cells[1], Is.EqualTo("ayende"));
+			Assert.That(cells[2], Is.InstanceOf<object[]>().And.Length.EqualTo(cells[0]));
+		}
+
+		[Test(Description = "NH-2782")] 
+		public void CanSelectPropertiesIntoPropertyListInProperty()
+		{
+			var result = db.Users
+				.Select(u => new { Cells = new List<object> { u.Id, u.Name, new object[u.Id] } })
+				.First();
+
+			var cells = result.Cells;
+			Assert.That(cells.Count, Is.EqualTo(3));
+			Assert.That(cells[1], Is.EqualTo("ayende"));
+			Assert.That(cells[2], Is.InstanceOf<object[]>().And.Length.EqualTo(cells[0]));
 		} 
 
 		[Test, Description("NH-2744")]

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

@@ -0,0 +1,57 @@
+using System.Linq;
+using NHibernate.Cfg.MappingSchema;
+using NHibernate.Mapping.ByCode;
+using NUnit.Framework;
+
+namespace NHibernate.Test.MappingByCode.ExplicitMappingTests
+{
+	[TestFixture]
+	public class MappingOfInternalMembersOnRootEntity
+	{
+		public class MyClass
+		{
+			protected internal int _id;
+			protected internal int _version;
+			protected internal string _something;
+		}
+
+		[Test]
+		public void MapClassWithInternalIdAndProperty()
+		{
+			var mapper = new ModelMapper();
+			mapper.Class<MyClass>(ca =>
+			{
+				ca.Id(x => x._id, map =>
+				{
+					map.Column("MyClassId");
+					map.Generator(Generators.HighLow, gmap => gmap.Params(new { max_low = 100 }));
+				});
+				ca.Version(x => x._version, map => { });
+				ca.Property(x => x._something, map => map.Length(150));
+			});
+			var hbmMapping = mapper.CompileMappingFor(new[] { typeof(MyClass) });
+			var hbmClass = hbmMapping.RootClasses[0];
+			Assert.That(hbmClass, Is.Not.Null);
+
+			var hbmId = hbmClass.Id;
+			Assert.That(hbmId, Is.Not.Null);
+			Assert.That(hbmId.name, Is.EqualTo("_id"));
+			Assert.That(hbmId.access, Is.EqualTo("field"));
+
+			var hbmIdGenerator = hbmId.generator;
+			Assert.That(hbmIdGenerator, Is.Not.Null);
+			Assert.That(hbmIdGenerator.@class, Is.EqualTo("hilo"));
+			Assert.That(hbmIdGenerator.param[0].name, Is.EqualTo("max_low"));
+			Assert.That(hbmIdGenerator.param[0].GetText(), Is.EqualTo("100"));
+
+			var hbmVersion = hbmClass.Version;
+			Assert.That(hbmVersion, Is.Not.Null);
+			Assert.That(hbmVersion.name, Is.EqualTo("_version"));
+
+			var hbmProperty = hbmClass.Properties.OfType<HbmProperty>().Single();
+			Assert.That(hbmProperty.name, Is.EqualTo("_something"));
+			Assert.That(hbmProperty.access, Is.EqualTo("field"));
+			Assert.That(hbmProperty.length, Is.EqualTo("150"));
+		}
+	}
+}

releasenotes.txt

@@ -0,0 +1,124 @@
+using System;
+using System.Linq;
+using NHibernate;
+using NHibernate.Cfg.MappingSchema;
+using NHibernate.Linq;
+using NHibernate.Mapping.ByCode;
+using NHibernate.Mapping.ByCode.Conformist;
+using NUnit.Framework;
+
+namespace NHibernate.Test.MappingByCode.ExplicitlyDeclaredModelTests
+{
+	public abstract class Parent
+	{
+		public virtual ParentId Id { get; set; }
+		public virtual string Name { get; set; }
+		public virtual Address Address { get; set; }
+	}
+
+	public class ParentId
+	{
+		public string Key1 { get; set; }
+		public string Key2 { get; set; }
+
+		public override bool Equals(object obj)
+		{
+			var pk = obj as ParentId;
+
+			if (obj == null)
+				return false;
+
+			return (Key1 == pk.Key1 && Key2 == pk.Key2);
+		}
+
+		public override int GetHashCode()
+		{
+			return (Key1 + "|" + Key2).GetHashCode();
+		}
+	}
+
+	public class Child1 : Parent
+	{
+	}
+
+	public class Child2 : Parent
+	{
+	}
+
+	class Child1Map : ClassMapping<Child1>
+	{
+		public Child1Map()
+		{
+			Table("Child1");
+
+			ComponentAsId<ParentId>(x => x.Id, pk =>
+			{
+				pk.Property(x => x.Key1, x => x.Column("key1"));
+				pk.Property(x => x.Key2, x =>
+				{
+					x.Column("key2");
+				});
+			});
+
+			Property(x => x.Name);
+
+			Component<Address>(x => x.Address, map =>
+			{
+				map.Property(y => y.City, mc => mc.Column("city1"));
+			});
+		}
+	}
+
+	class Child2Map : ClassMapping<Child2>
+	{
+		public Child2Map()
+		{
+			Table("Child2");
+
+			ComponentAsId<ParentId>(x => x.Id, pk =>
+			{
+				pk.Property(x => x.Key1, x => x.Column("key1"));
+				pk.Property(x => x.Key2, x =>
+				{
+					x.Column("key2__");
+				});
+			});
+
+			Property(x => x.Name);
+
+			Component<Address>(x => x.Address, map =>
+			{
+				map.Property(y => y.City, mc => mc.Column("city2"));
+			});
+		}
+	}
+
+	public class Address
+	{
+		public virtual string City { get; set; }
+	}
+
+	[TestFixture]
+	public class ComponentAsIdTest
+	{
+		[Test]
+		public void CanHaveSameComponentAsIdMultipleTimesWithDifferentColumnNamesForSameProperty()
+		{
+			//NH-3650
+			var model = new ModelMapper();
+			model.AddMapping<Child1Map>();
+			model.AddMapping<Child2Map>();
+
+			var mappings = model.CompileMappingForEach(new[] { typeof(Child1), typeof(Child2) });
+
+			var child1Mapping = mappings.ElementAt(0);
+			Assert.AreEqual("city1", child1Mapping.RootClasses[0].Properties.OfType<HbmComponent>().First().Properties.OfType<HbmProperty>().Single().column);
+			//next one fails
+			Assert.AreEqual("key2", child1Mapping.RootClasses[0].CompositeId.Items.OfType<HbmKeyProperty>().Last().column1);
+
+			var child2Mapping = mappings.ElementAt(1);
+			Assert.AreEqual("city2", child2Mapping.RootClasses[0].Properties.OfType<HbmComponent>().First().Properties.OfType<HbmProperty>().Single().column);
+			Assert.AreEqual("key2__", child2Mapping.RootClasses[0].CompositeId.Items.OfType<HbmKeyProperty>().Last().column1);
+		}
+	}
+}

src/NHibernate.Test/App.config

@@ -5,6 +5,12 @@ namespace NHibernate.Test.NHSpecificTest.NH1981
 	[TestFixture]
 	public class Fixture : BugTestCase
 	{
+		protected override bool AppliesTo(Dialect.Dialect dialect)
+		{
+			// Firebird doesn't support this feature
+			return !(dialect is Dialect.FirebirdDialect);
+		}
+
 		protected override void OnSetUp()
 		{
 			using (var s = OpenSession())
@@ -24,7 +30,7 @@ protected override void OnTearDown()
 			using (var tx = s.BeginTransaction())
 			{
 				s.Delete("from Article");
-				
+
 				tx.Commit();
 			}
 		}

src/NHibernate.Test/Criteria/CriteriaQueryTest.cs

@@ -15,6 +15,11 @@ namespace NHibernate.Test.NHSpecificTest.NH1989
 	[TestFixture]
 	public class Fixture : BugTestCase
 	{
+		protected override bool AppliesTo(ISessionFactoryImplementor factory)
+		{
+			return factory.ConnectionProvider.Driver.SupportsMultipleQueries;
+		}
+
 		protected override void OnSetUp()
 		{
 			cfg.Properties[Environment.CacheProvider] = typeof(HashtableCacheProvider).AssemblyQualifiedName;
@@ -47,7 +52,7 @@ public void SecondLevelCacheWithSingleCacheableFuture()
 			using (ISession s = OpenSession())
 			using (ITransaction tx = s.BeginTransaction())
 			{
-				User user = new User() { Name="test" };
+				User user = new User() { Name = "test" };
 				s.Save(user);
 				tx.Commit();
 			}
@@ -87,7 +92,7 @@ public void SecondLevelCacheWithDifferentRegionsFuture()
 			using (ISession s = OpenSession())
 			using (ITransaction tx = s.BeginTransaction())
 			{
-				User user = new User() { Name="test" };
+				User user = new User() { Name = "test" };
 				s.Save(user);
 				tx.Commit();
 			}
@@ -129,7 +134,7 @@ public void SecondLevelCacheWithMixedCacheableAndNonCacheableFuture()
 			using (ISession s = OpenSession())
 			using (ITransaction tx = s.BeginTransaction())
 			{
-				User user = new User() { Name="test" };
+				User user = new User() { Name = "test" };
 				s.Save(user);
 				tx.Commit();
 			}
@@ -181,7 +186,7 @@ public void SecondLevelCacheWithMixedCacheRegionsFuture()
 			using (ISession s = OpenSession())
 			using (ITransaction tx = s.BeginTransaction())
 			{
-				User user = new User() { Name="test" };
+				User user = new User() { Name = "test" };
 				s.Save(user);
 				tx.Commit();
 			}
@@ -239,7 +244,7 @@ public void SecondLevelCacheWithSingleCacheableQueryFuture()
 			using (ISession s = OpenSession())
 			using (ITransaction tx = s.BeginTransaction())
 			{
-				User user = new User() { Name="test" };
+				User user = new User() { Name = "test" };
 				s.Save(user);
 				tx.Commit();
 			}