Merge branch 'master' of https://github.com/nhibernate/nhibernate-core

Author: OnurGumus

Contributor Guide.md renamed to CONTRIBUTING.md

@@ -52,12 +52,16 @@ echo D. Add a test configuration for SQLite (x86).
 echo E. Add a test configuration for SQLite (x64). [not recommended]
 echo F. Add a test configuration for PostgreSQL.
 echo G. Add a test configuration for Oracle.
+echo H. Add a test configuration for SQL Server Compact (x86).
+echo I. Add a test configuration for SQL Server Compact (x64).
 echo.
 echo X.  Exit to main menu.
 echo.
 
-%BUILDTOOL% prompt ABCDEFGX
-if errorlevel 7 goto main-menu
+%BUILDTOOL% prompt ABCDEFGHIX
+if errorlevel 9 goto main-menu
+if errorlevel 8 goto test-setup-sqlservercex64
+if errorlevel 7 goto test-setup-sqlservercex86
 if errorlevel 6 goto test-setup-oracle
 if errorlevel 5 goto test-setup-postgresql
 if errorlevel 4 goto test-setup-sqlitex64
@@ -73,6 +77,20 @@ set LIB_FILES=
 set LIB_FILES2=
 goto test-setup-generic
 
+:test-setup-sqlservercex86
+set CONFIG_NAME=SqlServerCe32
+set PLATFORM=AnyCPU
+set LIB_FILES=lib\teamcity\SqlServerCe\*.dll
+set LIB_FILES2=lib\teamcity\SqlServerCe\X86\*.dll
+goto test-setup-generic
+
+:test-setup-sqlservercex64
+set CONFIG_NAME=SqlServerCe64
+set PLATFORM=AnyCPU
+set LIB_FILES=lib\teamcity\sqlServerCe\*.dll
+set LIB_FILES2=lib\teamcity\sqlServerCe\AMD64\*.dll
+goto test-setup-generic
+
 :test-setup-firebirdx86
 set CONFIG_NAME=FireBird
 set PLATFORM=x86
@@ -259,14 +277,18 @@ echo F. NHibernate Trunk - PostgreSQL
 echo G. NHibernate Trunk - Oracle (32-bit)
 echo H. NHibernate Trunk - Oracle Managed (32-bit)
 echo I. NHibernate Trunk - Oracle Managed (64-bit)
-echo J. NHibernate Trunk - SQL Server ODBC (32-bit)
+echo J. NHibernate Trunk - SQL Server Compact (32-bit)
+echo K. NHibernate Trunk - SQL Server Compact (64-bit)
+echo L. NHibernate Trunk - SQL Server ODBC (32-bit)
 echo.
 echo X.  Exit to main menu.
 echo.
 
-%BUILDTOOL% prompt ABCDEFGHIJX
-if errorlevel 10 goto main-menu
-if errorlevel 9 goto teamcity-sqlServerOdbc
+%BUILDTOOL% prompt ABCDEFGHIJKLX
+if errorlevel 12 goto main-menu
+if errorlevel 11 goto teamcity-sqlServerOdbc
+if errorlevel 10 goto teamcity-sqlServerCe64
+if errorlevel 9 goto teamcity-sqlServerCe32
 if errorlevel 8 goto teamcity-oraclemanaged-64
 if errorlevel 7 goto teamcity-oraclemanaged-32
 if errorlevel 6 goto teamcity-oracle32
@@ -337,5 +359,17 @@ move "%CURRENT_CONFIGURATION%" "%CURRENT_CONFIGURATION%-backup" 2> nul
 move "%CURRENT_CONFIGURATION%-backup" "%CURRENT_CONFIGURATION%" 2> nul
 goto main-menu
 
+:teamcity-sqlServerCe32
+move "%CURRENT_CONFIGURATION%" "%CURRENT_CONFIGURATION%-backup" 2> nul
+%NANT% /f:teamcity.build -D:skip.manual=true -D:CCNetLabel=-1 -D:config.teamcity=sqlServerCe32
+move "%CURRENT_CONFIGURATION%-backup" "%CURRENT_CONFIGURATION%" 2> nul
+goto main-menu
+
+:teamcity-sqlServerCe64
+move "%CURRENT_CONFIGURATION%" "%CURRENT_CONFIGURATION%-backup" 2> nul
+%NANT% /f:teamcity.build -D:skip.manual=true -D:CCNetLabel=-1 -D:config.teamcity=sqlServerCe64
+move "%CURRENT_CONFIGURATION%-backup" "%CURRENT_CONFIGURATION%" 2> nul
+goto main-menu
+
 :end
 popd

ShowBuildMenu.bat

@@ -301,6 +301,14 @@
 			</namespaces>
 		</xmlpoke>
 
+		<xmlpoke file="${app.config}"
+			xpath="//*/hbm:property[@name='command_timeout']"
+			value="${nhibernate.command_timeout}">
+			<namespaces>
+				<namespace prefix="hbm" uri="urn:nhibernate-configuration-2.2" />
+			</namespaces>
+		</xmlpoke>
+
 		<xmlpoke file="${app.config}"
 			xpath="//*/hbm:property[@name='connection.driver_class']"
 			value="${nhibernate.connection.driver_class}">

build-common/common-project.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" ?>
 <project xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd">
 	<property name="nhibernate.dialect" value="NHibernate.Dialect.MsSql2008Dialect"  overwrite="false"/>
+	<property name="nhibernate.command_timeout" value="444"  overwrite="false"/>
 	<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.SqlClientDriver" overwrite="false"/>
 	<property name="nhibernate.connection.connection_string" value="Server=.\SQLExpress;initial catalog=nhibernate;Integrated Security=SSPI" overwrite="false"/>
 </project>

build-common/nhibernate-properties.xml

@@ -1,7 +1,20 @@
+Build vNext
+=============================
+
+** Known BREAKING CHANGES from NH4.0.0.Alpha1 to 4.0.0.Alpha1
+
+    Fixed mapping by code behaviour when map child subclasses (see NH-3135 and NH-3269)
+    
+    The constructor of AbstractComponentTuplizer now behaves like AbstractEntityTuplizer in the way
+    that it doesn't create the instantiator any more. Custom component tuplizers that derive
+    directly from AbstractComponentTuplizer need to add this line of code in their constructor:
+      instantiator = BuildInstantiator(component);
+
+
 Build 4.0.0.Alpha1
 =============================
 
-** Known BREAKING CHANGES from NH3.3.3.GA to 4.0.0
+** Known BREAKING CHANGES from NH3.3.3.GA to 4.0.0.Alpha1
 
     NHibernate now targets .Net 4.0. Many uses of set types from Iesi.Collections have
     now been changed to use corresponding types from the BCL. The API for these types

lib/teamcity/sqlServerCe/AMD64/sqlceca40.dll

@@ -42,13 +42,13 @@ private void QueryKeyFilterDescLikeToCompare(out QueryKey qk, out QueryKey qk1)
 			f.SetParameter("pLike", "so%");
 			var fk =  new FilterKey(filterName, f.Parameters, f.FilterDefinition.ParameterTypes, EntityMode.Poco);
 			ISet<FilterKey> fks = new HashSet<FilterKey> { fk };
-			qk = new QueryKey(sessions, SqlAll, new QueryParameters(), fks);
+			qk = new QueryKey(sessions, SqlAll, new QueryParameters(), fks, null);
 
 			var f1 = new FilterImpl(sessions.GetFilterDefinition(filterName));
 			f1.SetParameter("pLike", "%ing");
 			var fk1 = new FilterKey(filterName, f.Parameters, f.FilterDefinition.ParameterTypes, EntityMode.Poco);
 			fks = new HashSet<FilterKey> { fk1 };
-			qk1 = new QueryKey(sessions, SqlAll, new QueryParameters(), fks);
+			qk1 = new QueryKey(sessions, SqlAll, new QueryParameters(), fks, null);
 		}
 
 		private void QueryKeyFilterDescValueToCompare(out QueryKey qk, out QueryKey qk1)
@@ -59,13 +59,13 @@ private void QueryKeyFilterDescValueToCompare(out QueryKey qk, out QueryKey qk1)
 			f.SetParameter("pDesc", "something").SetParameter("pValue", 10);
 			var fk = new FilterKey(filterName, f.Parameters, f.FilterDefinition.ParameterTypes, EntityMode.Poco);
 			ISet<FilterKey> fks = new HashSet<FilterKey> { fk };
-			qk = new QueryKey(sessions, SqlAll, new QueryParameters(), fks);
+			qk = new QueryKey(sessions, SqlAll, new QueryParameters(), fks, null);
 
 			var f1 = new FilterImpl(sessions.GetFilterDefinition(filterName));
 			f1.SetParameter("pDesc", "something").SetParameter("pValue", 11);
 			var fk1 = new FilterKey(filterName, f.Parameters, f.FilterDefinition.ParameterTypes, EntityMode.Poco);
 			fks = new HashSet<FilterKey> { fk1 };
-			qk1 = new QueryKey(sessions, SqlAll, new QueryParameters(), fks);
+			qk1 = new QueryKey(sessions, SqlAll, new QueryParameters(), fks, null);
 		}
 
 		[Test]
@@ -113,15 +113,15 @@ public void ToStringWithFilters()
 			f.SetParameter("pLike", "so%");
 			var fk = new FilterKey(filterName, f.Parameters, f.FilterDefinition.ParameterTypes, EntityMode.Poco);
 			ISet<FilterKey> fks = new HashSet<FilterKey> { fk };
-			var qk = new QueryKey(sessions, SqlAll, new QueryParameters(), fks);
+			var qk = new QueryKey(sessions, SqlAll, new QueryParameters(), fks, null);
 			Assert.That(qk.ToString(), Is.StringContaining(string.Format("filters: ['{0}']",fk)));
 
 			filterName = "DescriptionEqualAndValueGT";
 			f = new FilterImpl(sessions.GetFilterDefinition(filterName));
 			f.SetParameter("pDesc", "something").SetParameter("pValue", 10);
 			fk = new FilterKey(filterName, f.Parameters, f.FilterDefinition.ParameterTypes, EntityMode.Poco);
 			fks = new HashSet<FilterKey> { fk };
-			qk = new QueryKey(sessions, SqlAll, new QueryParameters(), fks);
+			qk = new QueryKey(sessions, SqlAll, new QueryParameters(), fks, null);
 			Assert.That(qk.ToString(), Is.StringContaining(string.Format("filters: ['{0}']", fk)));
 		}
 
@@ -139,7 +139,7 @@ public void ToStringWithMoreFilters()
 			var fvk = new FilterKey(filterName, f.Parameters, f.FilterDefinition.ParameterTypes, EntityMode.Poco);
 
 			ISet<FilterKey> fks = new HashSet<FilterKey> { fk, fvk };
-			var qk = new QueryKey(sessions, SqlAll, new QueryParameters(), fks);
+			var qk = new QueryKey(sessions, SqlAll, new QueryParameters(), fks, null);
 			Assert.That(qk.ToString(), Is.StringContaining(string.Format("filters: ['{0}', '{1}']", fk, fvk)));
 		}
 	}

lib/teamcity/sqlServerCe/AMD64/sqlcecompact40.dll

@@ -2652,20 +2652,20 @@ public void ParametersInCountExpression()
 		[Test]
 		public void TransformToRowCountTest()
 		{
-			ISession s = OpenSession();
-			ITransaction t = s.BeginTransaction();
-
-			ICriteria crit = s.CreateCriteria(typeof(Student));
-			ICriteria subCriterium = crit.CreateCriteria("PreferredCourse");
-			subCriterium.Add(Property.ForName("CourseCode").Eq("PREFFERED_CODE"));
+			using (ISession s = OpenSession())
+			using (ITransaction t = s.BeginTransaction())
+			{
+				ICriteria crit = s.CreateCriteria(typeof (Student));
+				ICriteria subCriterium = crit.CreateCriteria("PreferredCourse");
+				subCriterium.Add(Property.ForName("CourseCode").Eq("PREFFERED_CODE"));
 
 
-			ICriteria countCriteria = CriteriaTransformer.TransformToRowCount(crit);
+				ICriteria countCriteria = CriteriaTransformer.TransformToRowCount(crit);
 
-			countCriteria.List();
+				countCriteria.List();
 
-			t.Rollback();
-			s.Close();
+				t.Rollback();
+			}
 		}
 
 		[Test]
@@ -2689,51 +2689,53 @@ public void OrderProjectionTest()
 		[Test]
 		public void OrderProjectionAliasedTest()
 		{
-			ISession session = OpenSession();
-			ITransaction t = session.BeginTransaction();
+			using (ISession session = OpenSession())
+			using (ITransaction t = session.BeginTransaction())
+			{
 
-			Course courseA = new Course();
-			courseA.CourseCode = "HIB-A";
-			courseA.Description = "Hibernate Training A";
-			session.Save(courseA);
+				Course courseA = new Course();
+				courseA.CourseCode = "HIB-A";
+				courseA.Description = "Hibernate Training A";
+				session.Save(courseA);
 
-			Student gavin = new Student();
-			gavin.Name = "Gavin King";
-			gavin.StudentNumber = 232;
-			gavin.PreferredCourse = courseA;
-			session.Save(gavin);
+				Student gavin = new Student();
+				gavin.Name = "Gavin King";
+				gavin.StudentNumber = 232;
+				gavin.PreferredCourse = courseA;
+				session.Save(gavin);
 
-			Student leonardo = new Student();
-			leonardo.Name = "Leonardo Quijano";
-			leonardo.StudentNumber = 233;
-			leonardo.PreferredCourse = courseA;
-			session.Save(leonardo);
+				Student leonardo = new Student();
+				leonardo.Name = "Leonardo Quijano";
+				leonardo.StudentNumber = 233;
+				leonardo.PreferredCourse = courseA;
+				session.Save(leonardo);
 
-			Student johnDoe = new Student();
-			johnDoe.Name = "John Doe";
-			johnDoe.StudentNumber = 235;
-			johnDoe.PreferredCourse = null;
-			session.Save(johnDoe);
+				Student johnDoe = new Student();
+				johnDoe.Name = "John Doe";
+				johnDoe.StudentNumber = 235;
+				johnDoe.PreferredCourse = null;
+				session.Save(johnDoe);
 
-			IProjection conditional =
-				Projections.Conditional(
-					Restrictions.Eq("Name", "Gavin King"),
-					Projections.Constant("Name"),
-					Projections.Constant("AnotherName"));
-
-			ICriteria criteria = session.CreateCriteria(typeof(Student));
-			criteria.SetMaxResults(1);
-			criteria.SetFirstResult(1);
-			IList result = criteria.SetProjection(Projections.Alias(conditional, "CheckName"))
-			.AddOrder(Order.Asc("CheckName"))
-			.List();
+				IProjection conditional =
+					Projections.Conditional(
+						Restrictions.Eq("Name", "Gavin King"),
+						Projections.Constant("Name"),
+						Projections.Constant("AnotherName"));
+
+				ICriteria criteria = session.CreateCriteria(typeof(Student));
+				criteria.SetMaxResults(1);
+				criteria.SetFirstResult(1);
+				IList result = criteria.SetProjection(Projections.Alias(conditional, "CheckName"))
+					.AddOrder(Order.Asc("CheckName"))
+					.List();
 
-			session.Delete(gavin);
-			session.Delete(leonardo);
-			session.Delete(johnDoe);
-			session.Delete(courseA);
-			t.Commit();
-			session.Close();
+				session.Delete(gavin);
+				session.Delete(leonardo);
+				session.Delete(johnDoe);
+				session.Delete(courseA);
+
+				t.Commit();
+			}
 		}
 
 		[Test]