Merge branch 'master' into NH-3606

Author: hazzik

build-common/NHibernate.props

@@ -21,5 +21,8 @@
     <PackageLicenseUrl>https://raw.githubusercontent.com/nhibernate/nhibernate-core/master/LICENSE.txt</PackageLicenseUrl>
     <RepositoryUrl>https://github.com/nhibernate/nhibernate-core.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
+
+    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+    <TreatSpecificWarningsAsErrors />
   </PropertyGroup>
 </Project>

doc/reference/modules/basic_mapping.xml

@@ -2633,7 +2633,7 @@
                 types, <literal>System.Object</literal> types, and <literal>System.Object</literal> types for large objects.  Just like
                 Columns for System.ValueType types can handle <literal>null</literal> values only if the entity property is properly
                 typed with a <literal>Nullable&lt;T&gt;</literal>. Otherwise <literal>null</literal> will be replaced by the default
-                value for the type when reading, and when be overwritten by it when persisting the entity, potentially leading to
+                value for the type when reading, and then will be overwritten by it when persisting the entity, potentially leading to
                 phantom updates.
             </para>
             <table>
@@ -3025,6 +3025,12 @@
                 <literal>NHibernate.Type.TypeFactory</literal>.
             </para>
 
+            <para>
+                Default NHibernate types used when no <literal>type</literal> attribute is specified can be overridden by using
+                the <literal>NHibernate.Type.TypeFactory.RegisterType</literal> static method before configuring and building
+                session factories.
+            </para>
+
         </sect2>
 
         <sect2 id="mapping-types-custom">

lib/teamcity/oracle/oracle_installation.txt

@@ -41,4 +41,10 @@ This is needed because NHibernate test uses the managed driver NuGet package, bu
 version needs to be removed from the GAC. Read more on https://stackoverflow.com/a/35176586/1178314.
 Not doing this may notably cause failures in distributed transaction tests.
 
+Adjust the connection string for the tests:
+The tests involve creating and dropping many tables, sometimes with the same names but different data
+types. This does not play well with Oracle meta data pooling, which needs to be disabled.
+Add into your ODP.NET connection string:
+Metadata Pooling=false;Self Tuning=false;
+
 Please note that some tests are dependent on the machine locales, and may fail if they are not English.

src/.gitignore

@@ -22,9 +22,9 @@
 *.scc
 *.tokens
 [Bb]in
-[Db]ebug*/
+[Db]ebug/
 obj/
-[Rr]elease*/
+[Rr]elease/
 *resharper*
 _ReSharper*/
 [Tt]est[Rr]esult*

src/NHibernate.DomainModel/NHSpecific/AnonymousType1.cs

@@ -0,0 +1,72 @@
+using System;
+using System.Linq;
+using System.Linq.Expressions;
+
+// Simulates compiler-generated, non-namespaced anonymous type with one property
+internal class AnonymousType1<TProp1>
+{
+	public TProp1 Prop1 { get; set; }
+}
+
+namespace NHibernate.DomainModel.NHSpecific
+{
+	public class AnonymousTypeQueryExpressionProviderFromNHibernateDomainModelAssembly
+	{
+		private readonly TypedQueryExpressionProvider<AnonymousType1<string>> _provider
+			= new TypedQueryExpressionProvider<AnonymousType1<string>>();
+
+		public System.Type GetAnonymousType()
+		{
+			return _provider.GetSuppliedType();
+		}
+
+		public Expression GetExpressionOfMethodCall()
+		{
+			return _provider.GetExpressionOfMethodCall();
+		}
+
+		public Expression GetExpressionOfNew()
+		{
+			return _provider.GetExpressionOfNew();
+		}
+		
+		public Expression GetExpressionOfTypeBinary()
+		{
+			return _provider.GetExpressionOfTypeBinary();
+		}
+	}
+
+	public class TypedQueryExpressionProvider<T> where T : new ()
+	{
+		public System.Type GetSuppliedType()
+		{
+			return typeof(T);
+		}
+
+		public Expression GetExpressionOfMethodCall()
+		{
+			Expression<Func<object>> exp = () =>
+				Enumerable.Empty<object>().Select(o => (T)o).ToList();
+
+			return exp;
+		}
+
+		public Expression GetExpressionOfNew()
+		{
+			// adds .GetHashCode to make sure the .ToList is always of same generic type
+			// so that the only variable part is the 'new T()'
+			Expression<Func<object>> exp = () =>
+				Enumerable.Empty<object>().Select(o => new T().GetHashCode()).ToList();
+
+			return exp;
+		}
+
+		public Expression GetExpressionOfTypeBinary()
+		{
+			Expression<Func<object>> exp = () =>
+				Enumerable.Empty<object>().Select(o => o is T).ToList();
+
+			return exp;
+		}
+	}
+}

src/NHibernate.DomainModel/NHibernate.DomainModel.csproj

@@ -6,10 +6,6 @@
     <IsTestProject>true</IsTestProject>
     <NoWarn>$(NoWarn);3001;3002;3003;3005</NoWarn>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
-    <TreatSpecificWarningsAsErrors />
-  </PropertyGroup>
   <ItemGroup>
     <None Remove="**\*.hbm.xml" />
   </ItemGroup>

src/NHibernate.Test/Async/Criteria/EntityProjectionsTest.cs

@@ -25,7 +25,9 @@ namespace NHibernate.Test.Criteria
 	[TestFixture]
 	public class EntityProjectionsTestAsync : TestCaseMappingByCode
 	{
+		private const string customEntityName = "CustomEntityName";
 		private EntityWithCompositeId _entityWithCompositeId;
+		private EntityCustomEntityName _entityWithCustomEntityName;
 
 		protected override HbmMapping GetMappings()
 		{
@@ -76,6 +78,16 @@ protected override HbmMapping GetMappings()
 
 					rc.Property(e => e.Name);
 				});
+
+			mapper.Class<EntityCustomEntityName>(
+				rc =>
+				{
+					rc.EntityName(customEntityName);
+
+					rc.Id(x => x.Id, m => m.Generator(Generators.GuidComb));
+					rc.Property(x => x.Name);
+				});
+
 			return mapper.CompileMappingForAllExplicitlyAddedEntities();
 		}
 
@@ -117,6 +129,11 @@ protected override void OnSetUp()
 					}
 				};
 
+				_entityWithCustomEntityName = new EntityCustomEntityName()
+				{
+					Name = "EntityCustomEntityName"
+				};
+
 				_entityWithCompositeId = new EntityWithCompositeId
 				{
 					Key = new CompositeKey
@@ -132,6 +149,7 @@ protected override void OnSetUp()
 				session.Save(parent.SameTypeChild);
 				session.Save(parent);
 				session.Save(_entityWithCompositeId);
+				session.Save(customEntityName, _entityWithCustomEntityName);
 
 				session.Flush();
 				transaction.Commit();
@@ -459,5 +477,22 @@ public async Task EntityProjectionForCompositeKeyLazyAsync()
 				Assert.That(NHibernateUtil.IsInitialized(composite), Is.False, "Object must be lazy loaded.");
 			}
 		}
+
+		[Test]
+		public async Task EntityProjectionForCustomEntityNameAsync()
+		{
+			using (var session = OpenSession())
+			{
+				var entity = await (session
+							.QueryOver<EntityCustomEntityName>(customEntityName)
+							.Select(Projections.RootEntity())
+							.Take(1).SingleOrDefaultAsync());
+
+				Assert.That(entity, Is.Not.Null);
+				Assert.That(NHibernateUtil.IsInitialized(entity), Is.True, "Object must be initialized.");
+				Assert.That(entity.Id, Is.EqualTo(_entityWithCustomEntityName.Id));
+				Assert.That(entity.Name, Is.EqualTo(_entityWithCustomEntityName.Name));
+			}
+		}
 	}
 }