Merge remote-tracking branch 'nhibernate/master'

Author: oskarb

src/NHibernate.Test/Linq/ExpressionSessionLeakTest.cs

@@ -8,7 +8,7 @@ namespace NHibernate.Test.Linq
 {
 	public class ExpressionSessionLeakTest : LinqTestCase
 	{
-		[Test, KnownBug("NH-3579")]
+		[Test]
 		public void SessionGetsCollected()
 		{
 			var reference = DoLinqInSeparateSession();

src/NHibernate.Test/NHSpecificTest/NH3590/Entity.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+
+namespace NHibernate.Test.NHSpecificTest.NH3590
+{
+	public class Entity
+	{
+		public Entity()
+		{
+			Dates = new HashSet<DateTime>();
+		}
+
+		public virtual Guid Id { get; protected set; }
+		public virtual ISet<DateTime> Dates { get; protected set; }
+
+		public override bool Equals(object obj)
+		{
+			var that = obj as Entity;
+			return that != null && that.Id == Id;
+		}
+
+		public override int GetHashCode()
+		{
+			return Id.GetHashCode();
+		}
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH3590/Fixture.cs

@@ -0,0 +1,83 @@
+using System;
+using NUnit.Framework;
+using SharpTestsEx;
+
+namespace NHibernate.Test.NHSpecificTest.NH3590
+{
+	[TestFixture]
+	public class Fixture : BugTestCase
+	{
+		private Entity entity;
+
+		protected override void OnSetUp()
+		{
+			entity = new Entity();
+			using (var s = OpenSession())
+			{
+				using (var tx = s.BeginTransaction())
+				{
+					s.Save(entity);
+					tx.Commit();
+				}
+			}
+		}
+
+		[Test, KnownBug("3590")]
+		public void ShouldUpdate()
+		{
+			entity.Dates.Add(DateTime.Now);
+			using (var s = OpenSession())
+			{
+				using (var tx = s.BeginTransaction())
+				{
+					s.Update(entity);
+					tx.Commit();
+				}
+			}
+
+			using (var s = OpenSession())
+			{
+				using (s.BeginTransaction())
+				{
+					s.Get<Entity>(entity.Id).Dates.Count
+						.Should().Be.EqualTo(1);
+				}
+			}
+		}
+
+		[Test, KnownBug("3590")]
+		public void ShouldMerge()
+		{
+			entity.Dates.Add(DateTime.Now);
+			using (var s = OpenSession())
+			{
+				using (var tx = s.BeginTransaction())
+				{
+					s.Merge(entity);
+					tx.Commit();
+				}
+			}
+
+			using (var s = OpenSession())
+			{
+				using (s.BeginTransaction())
+				{
+					s.Get<Entity>(entity.Id).Dates.Count
+						.Should().Be.EqualTo(1);
+				}
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			using (var s = OpenSession())
+			{
+				using (var tx = s.BeginTransaction())
+				{
+					s.Delete(s.Get<Entity>(entity.Id));
+					tx.Commit();
+				}
+			}
+		}
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH3590/Mappings.hbm.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+				   namespace="NHibernate.Test.NHSpecificTest.NH3590"
+				   assembly="NHibernate.Test">
+
+  <class name="Entity">
+    <id name="Id"
+          type="guid">
+      <generator class="guid.comb" />
+    </id>
+    <set name="Dates">
+      <key column="entity_id" />
+      <element column="Date" type="DateTime"/>
+    </set>
+  </class>
+</hibernate-mapping>

src/NHibernate.Test/NHibernate.Test.csproj

@@ -1155,6 +1155,8 @@
     <Compile Include="NHSpecificTest\ProxyValidator\ShouldBeProxiableTests.cs" />
     <Compile Include="NHSpecificTest\NH2898\ItemWithLazyProperty.cs" />
     <Compile Include="NHSpecificTest\NH2898\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH3590\Entity.cs" />
+    <Compile Include="NHSpecificTest\NH3590\Fixture.cs" />
     <Compile Include="NHSpecificTest\SqlConverterAndMultiQuery\Fixture.cs" />
     <Compile Include="NHSpecificTest\SqlConverterAndMultiQuery\Model.cs" />
     <Compile Include="NHSpecificTest\SqlConverterAndMultiQuery\SqlConverter.cs" />
@@ -3009,6 +3011,7 @@
     <EmbeddedResource Include="NHSpecificTest\NH1291AnonExample\Mappings.hbm.xml" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="NHSpecificTest\NH3590\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3377\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2865\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2756\Mappings.hbm.xml" />

src/NHibernate/ISession.cs

@@ -18,7 +18,7 @@ namespace NHibernate
 	/// transaction. (Long transactions might span several database transactions.)
 	/// </para>
 	/// <para>
-	/// The main function of the <c>ISession</c> is to offer create, find and delete operations
+	/// The main function of the <c>ISession</c> is to offer create, find, update, and delete operations
 	/// for instances of mapped entity classes. Instances may exist in one of two states:
 	/// <list type="bullet">
 	/// <item>transient: not associated with any <c>ISession</c></item>

src/NHibernate/Linq/DefaultQueryProvider.cs

@@ -20,14 +20,17 @@ public class DefaultQueryProvider : INhQueryProvider
 	{
 		private static readonly MethodInfo CreateQueryMethodDefinition = ReflectionHelper.GetMethodDefinition((DefaultQueryProvider p) => p.CreateQuery<object>(null));
 
+		private readonly WeakReference _session;
+
 		public DefaultQueryProvider(ISessionImplementor session)
 		{
-			Session = session;
+			_session = new WeakReference(session, true);
 		}
 
-		protected virtual ISessionImplementor Session { get; private set; }
-
-		#region IQueryProvider Members
+		protected virtual ISessionImplementor Session
+		{
+			get { return _session.Target as ISessionImplementor; }
+		}
 
 		public virtual object Execute(Expression expression)
 		{
@@ -47,16 +50,14 @@ public virtual IQueryable CreateQuery(Expression expression)
 		{
 			MethodInfo m = CreateQueryMethodDefinition.MakeGenericMethod(expression.Type.GetGenericArguments()[0]);
 
-			return (IQueryable) m.Invoke(this, new[] {expression});
+			return (IQueryable) m.Invoke(this, new object[] {expression});
 		}
 
 		public virtual IQueryable<T> CreateQuery<T>(Expression expression)
 		{
 			return new NhQueryable<T>(this, expression);
 		}
 
-		#endregion
-
 		public virtual object ExecuteFuture(Expression expression)
 		{
 			IQuery query;
@@ -92,7 +93,6 @@ protected virtual object ExecuteFutureQuery(NhLinqExpression nhLinqExpression, I
 
 			object result = method.Invoke(query, new object[0]);
 
-
 			if (nhQuery.ExpressionToHqlTranslationResults.PostExecuteTransformer != null)
 			{
 				((IDelayedValue) result).ExecuteOnEval = nhQuery.ExpressionToHqlTranslationResults.PostExecuteTransformer;