Merge branches 'gh-321' and 'gh-322'

Author: hazzik

src/NHibernate.Test/Linq/LinqQuerySamples.cs

@@ -9,6 +9,22 @@ namespace NHibernate.Test.Linq
 	[TestFixture]
 	public class LinqQuerySamples : LinqTestCase
 	{
+		[Test]
+		public void GroupTwoQueriesAndSum()
+		{
+			//NH-3534
+			var queryWithAggregation = from o1 in db.Orders
+									   from o2 in db.Orders
+									   where o1.Customer.CustomerId == o2.Customer.CustomerId && o1.OrderDate == o2.OrderDate
+									   group o1 by new { o1.Customer.CustomerId, o1.OrderDate } into g
+									   select new { CustomerId = g.Key.CustomerId, LastOrderDate = g.Max(x => x.OrderDate) };
+
+			var result = queryWithAggregation.ToList();
+
+			Assert.IsNotNull(result);
+			Assert.IsNotEmpty(result);
+		}
+
 		[Category("WHERE")]
 		[Test(Description = "This sample uses WHERE to filter for Customers in London.")]
 		public void DLinq1()

src/NHibernate.Test/MappingByCode/ExplicitMappingTests/ComponentAsIdTests.cs

@@ -29,6 +29,21 @@ private class MyComponent : IMyCompo
 			public string Name { get; set; }
 		}
 
+		[Test]
+		public void CanSpecifyUnsavedValue()
+		{
+			//NH-3048
+			var mapper = new ModelMapper();
+			mapper.Class<MyClass>(map => map.ComponentAsId(x => x.Id, x =>
+				{
+					x.UnsavedValue(UnsavedValueType.Any);
+				}));
+
+			var mapping = mapper.CompileMappingForAllExplicitlyAddedEntities();
+
+			Assert.AreEqual(mapping.RootClasses[0].CompositeId.unsavedvalue, HbmUnsavedValueType.Any);
+		}
+
 		[Test]
 		public void WhenPropertyUsedAsComposedIdThenRegister()
 		{

src/NHibernate/Mapping/ByCode/ICompositeIdMapper.cs

@@ -12,6 +12,8 @@ public interface IComponentAsIdAttributesMapper : IAccessorPropertyMapper
 		/// Useful when the property is an interface and you need the mapping to a concrete class mapped as component.
 		/// </remarks>
 		void Class(System.Type componentType);
+
+		void UnsavedValue(UnsavedValueType unsavedValueType);
 	}
 
 	public interface IComponentAsIdMapper : IComponentAsIdAttributesMapper, IMinimalPlainPropertyContainerMapper { }
@@ -21,6 +23,8 @@ public interface IComposedIdMapper<TEntity> : IMinimalPlainPropertyContainerMapp
 	public interface IComponentAsIdAttributesMapper<TComponent> : IAccessorPropertyMapper
 	{
 		void Class<TConcrete>() where TConcrete : TComponent;
+
+		void UnsavedValue(UnsavedValueType unsavedValueType);
 	}
 
 	public interface IComponentAsIdMapper<TComponent> : IComponentAsIdAttributesMapper<TComponent>, IMinimalPlainPropertyContainerMapper<TComponent>

src/NHibernate/Mapping/ByCode/Impl/ComponentAsIdMapper.cs

@@ -20,6 +20,11 @@ public ComponentAsIdMapper(System.Type componentType, MemberInfo declaringTypeMe
 			accessorPropertyMapper = new AccessorPropertyMapper(declaringTypeMember.DeclaringType, declaringTypeMember.Name, x => id.access = x);
 		}
 
+		public void UnsavedValue(UnsavedValueType unsavedValueType)
+		{
+			id.unsavedvalue = (HbmUnsavedValueType)Enum.Parse(typeof(HbmUnsavedValueType), unsavedValueType.ToString());
+		}
+
 		public HbmCompositeId CompositeId
 		{
 			get { return id; }

src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ComponentAsIdCustomizer.cs

@@ -19,6 +19,11 @@ public ComponentAsIdCustomizer(IModelExplicitDeclarationsHolder explicitDeclarat
 			explicitDeclarationsHolder.AddAsPoid(propertyPath.LocalMember);
 		}
 
+		public void UnsavedValue(UnsavedValueType unsavedValueType)
+		{
+			CustomizersHolder.AddCustomizer(PropertyPath, (IComponentAsIdAttributesMapper m) => m.UnsavedValue(unsavedValueType));
+		}
+
 		public void Class<TConcrete>() where TConcrete : TComponent
 		{
 			CustomizersHolder.AddCustomizer(PropertyPath, (IComponentAsIdAttributesMapper m) => m.Class(typeof(TConcrete)));

src/NHibernate/Mapping/ByCode/UnsavedValueType.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NHibernate.Mapping.ByCode
+{
+	public enum UnsavedValueType
+	{
+		Undefined,
+
+		Any,
+
+		None,
+	}
+}

src/NHibernate/NHibernate.csproj

@@ -498,6 +498,7 @@
     <Compile Include="Mapping\ByCode\NotFoundMode.cs" />
     <Compile Include="Mapping\ByCode\SchemaAction.cs" />
     <Compile Include="Mapping\ByCode\TypeExtensions.cs" />
+    <Compile Include="Mapping\ByCode\UnsavedValueType.cs" />
     <Compile Include="Mapping\ByCode\VersionGeneration.cs" />
     <Compile Include="Mapping\Collection.cs" />
     <Compile Include="Mapping\Column.cs" />