Merge branch 'master' into dep

Author: hazzik

README.md

@@ -103,7 +103,7 @@ of NHibernate (in no particular order):
 [Apache Software Foundation]: http://www.apache.org
 [JetBrains]: http://www.jetbrains.com
 [ReSharper]: http://www.jetbrains.com/resharper
-[LinFu]: http://code.google.com/p/linfu
+[LinFu]: https://github.com/philiplaureano/LinFu
 [article]: http://www.codeproject.com/KB/recipes/sets.aspx
-[Relinq]: http://relinq.codeplex.com/
+[Relinq]: https://github.com/re-motion/Relinq
 [AsyncGenerator]: http://github.com/maca88/AsyncGenerator

releasenotes.txt

@@ -1,4 +1,36 @@
-Build 5.3.2
+Build 5.3.3
+=============================
+
+Release notes - NHibernate - Version 5.3.3
+
+16 issues were resolved in this release.
+
+** Bug
+
+   * #2519 Fix parameter caching for Linq provider
+   * #2515 InvalidCastException for Linq query with subquery
+   * #2514 Entity with field interceptor are not correctly passed as Linq parameters
+   * #2512 Linq queries with a condition after a projection on a collection fail
+   * #2511 Linq Fetch over component after fetching a many-to-one throws exception
+   * #2508 OnPreUpdateCollection - Passed entity instance X is not of expected type Y
+   * #2499 Cast operation fails when an enum is mapped as an AnsiString
+   * #2490 Unnecessary cast in sql with Linq are causing performance issues
+   * #2488 Fix parameter detection for Equals and CompareTo methods for Linq provider
+   * #2485 Throw entity not mapped exception for entity join in hql if possible
+   * #2484 Entity Joins are not polymorphic in hql
+   * #2476 Hashset add returns true instead of false
+   * #2474 Fetch all lazy properties when entity is already loaded fails
+   * #2471 AsQueryable() on collection throws if applied after Where statement
+
+** Task
+
+   * #2482 Add missing possible breaking changes for #2010
+   * #2527 Release 5.3.3
+
+As part of releasing 5.3.3, two missing 5.3.0 possible breaking changes have been added, about
+uninitialized extra lazy collections and SQLite schema validation. See 5.3.0 possible breaking changes.
+
+Build 5.3.2
 =============================
 
 Release notes - NHibernate - Version 5.3.2
@@ -69,12 +101,40 @@ Release notes - NHibernate - Version 5.3.0
           stored as `REAL` instead of `NUMERIC`. Both are binary floating point types, excepted that `NUMERIC`
           stores integral values as `INTEGER`. This change may cause big integral decimal values to lose more
           precision in SQLite.
+        * SQLite: non supported SQL type names previously used by NHibernate, resulting in unexpected actual typing,
+          have been fixed. This causes databases generated by a previous NHibernate version to fail schema validation
+          by 5.3 or higher versions. See #2507 for more information.
         * Custom dialects used for databases that do not support cross join will have to override
           `SupportsCrossJoin` property and set it to `false`.
         * `VisitorParameters.ConstantToParameterMap` may contain the same parameter for multiple constant
           expressions.
         * `ICache` caches yielded by the session factory will be `CacheBase` wrappers around the cache actually
           provided by the cache provider, if it was not deriving from `CacheBase`.
+        * Calling `IList.RemoveAt` or `IList<>.RemoveAt` on an uninitialized list with a negative number
+          will now throw an `ArgumentOutOfRangeException`.
+        * Calling `IList.RemoveAt` or `IList<>.RemoveAt` on an uninitialized list mapped as `lazy="extra"`
+          with a number that is equal or higher that the current collection size will now throw an
+          `ArgumentOutOfRangeException`.
+        * Calling `IList.Insert` or `IList<>.Insert` on an uninitialized list with a negative number will
+          now throw an `ArgumentOutOfRangeException`.
+        * Calling `IList.Insert` or `IList<>.Insert` on an uninitialized list mapped as `lazy="extra"`
+          with a number that is higher that the current collection size will now throw an 
+          `ArgumentOutOfRangeException`.
+        * Getting or setting a value with `IList.this[int index]` or `IList<>.this[int index]` on an uninitialized
+          list with a negative number will now throw an `ArgumentOutOfRangeException`.
+        * Setting a value with `IList.this[int index]` or `IList<>.this[int index]` on an uninitialized list
+          mapped as `lazy="extra"` with a number that is equal or higher that the current collection size will now
+          throw an `ArgumentOutOfRangeException`.
+        * Calling `IDictionary<,>.Add` or `ICollection<>.Add` on an uninitialized map mapped as `lazy="extra"` with
+          a key that already exists will now throw an `ArgumentException`.
+        * Calling `IDictionary<,>.Remove` or `ICollection<>.Remove` on an uninitialized map mapped as `lazy="extra"`
+          with a key that does not exist will now return false.
+        * Map dirtiness is now evaluated by `EqualityComparer<TValue>.Default` when setting an existing key value
+          with `IDictionary<,>.this[]` on an initialized map.
+        * Calling `ISet<>.Add` on an uninitialized set mapped as `lazy="extra"` with a transient element that
+          already exists in the set will now return false.
+        * Calling `ISet<>.Add` or `ICollection<>.Add` on an uninitialized set mapped as `lazy="true"` with a
+          transient element that does not override `Equals` method will not initialize the collection.
 
 ** Bug
 

src/AsyncGenerator.yml

@@ -287,6 +287,7 @@ methodRules:
   - containingType: NHibernate.Linq.DmlExtensionMethods
   - containingType: NHibernate.Linq.InsertBuilder<TSource, TTarget>
   - containingType: NHibernate.Linq.UpdateBuilder<TSource>
+  - containingType: NHibernate.Multi.IQueryBatch 
   name: PubliclyExposedType
 - filters:
   - hasAttributeName: ObsoleteAttribute

src/NHibernate.DomainModel/Northwind/Entities/AnotherEntityRequired.cs

@@ -22,6 +22,8 @@ public class AnotherEntityRequired
 
 		public virtual ISet<AnotherEntity> RelatedItems { get; set; } = new HashSet<AnotherEntity>();
 
+		public virtual ISet<AnotherEntityRequired> RequiredRelatedItems { get; set; } = new HashSet<AnotherEntityRequired>();
+
 		public virtual bool? NullableBool { get; set; }
 	}
 

src/NHibernate.DomainModel/Northwind/Entities/Northwind.cs

@@ -69,6 +69,11 @@ public IQueryable<User> Users
             get { return _session.Query<User>(); }
         }
 
+        public IQueryable<NumericEntity> NumericEntities
+        {
+            get { return _session.Query<NumericEntity>(); }
+        }
+
         public IQueryable<DynamicUser> DynamicUsers
         {
             get { return _session.Query<DynamicUser>(); }

src/NHibernate.DomainModel/Northwind/Entities/NumericEntity.cs

@@ -0,0 +1,29 @@
+namespace NHibernate.DomainModel.Northwind.Entities
+{
+	public class NumericEntity
+	{
+		public virtual short Short { get; set; }
+
+		public virtual short? NullableShort { get; set; }
+
+		public virtual int Integer { get; set; }
+
+		public virtual int? NullableInteger { get; set; }
+
+		public virtual long Long { get; set; }
+
+		public virtual long? NullableLong { get; set; }
+
+		public virtual decimal Decimal { get; set; }
+
+		public virtual decimal? NullableDecimal { get; set; }
+
+		public virtual float Single { get; set; }
+
+		public virtual float? NullableSingle { get; set; }
+
+		public virtual double Double { get; set; }
+
+		public virtual double? NullableDouble { get; set; }
+	}
+}

src/NHibernate.DomainModel/Northwind/Mappings/AnotherEntityRequired.hbm.xml

@@ -19,5 +19,9 @@
       <key column="Id"/>
       <one-to-many class="AnotherEntity"/>
     </set>
+    <set name="RequiredRelatedItems" lazy="true" inverse="true">
+      <key column="Id"/>
+      <one-to-many class="AnotherEntityRequired"/>
+    </set>
   </class>
 </hibernate-mapping>

src/NHibernate.DomainModel/Northwind/Mappings/NumericEntity.hbm.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" namespace="NHibernate.DomainModel.Northwind.Entities" assembly="NHibernate.DomainModel">
+  <class name="NumericEntity">
+    <id name="Short">
+      <generator class="assigned" />
+    </id>
+
+    <property name="NullableShort" />
+    <property name="Integer" not-null="true" column="`Integer`" />
+    <property name="NullableInteger" />
+    <property name="Long" not-null="true" column="`Long`" />
+    <property name="NullableLong" />
+    <property name="Decimal" not-null="true" column="`Decimal`" />
+    <property name="NullableDecimal" />
+    <property name="Single" not-null="true" column="`Single`" />
+    <property name="NullableSingle" />
+    <property name="Double" not-null="true" column="`Double`" />
+    <property name="NullableDouble" />
+  </class>
+</hibernate-mapping>

src/NHibernate.Test/Async/CacheTest/BatchableCacheFixture.cs

@@ -1112,7 +1112,7 @@ public async Task QueryCacheTestAsync()
 
 				using (var t = s.BeginTransaction())
 				{
-					await (queries.ExecuteAsync(CancellationToken.None));
+					await (queries.ExecuteAsync());
 					await (t.CommitAsync());
 				}
 
@@ -1127,24 +1127,24 @@ public async Task QueryCacheTestAsync()
 				// Run a second time, to test the query cache
 				using (var t = s.BeginTransaction())
 				{
-					await (queries.ExecuteAsync(CancellationToken.None));
+					await (queries.ExecuteAsync());
 					await (t.CommitAsync());
 				}
 
 				Assert.That(
-					await (queries.GetResultAsync<ReadOnly>(0, CancellationToken.None)),
+					await (queries.GetResultAsync<ReadOnly>(0)),
 					Has.Count.EqualTo(1).And.One.Property(nameof(ReadOnly.Name)).EqualTo(name1), "q1");
 				Assert.That(
-					await (queries.GetResultAsync<ReadOnly>(1, CancellationToken.None)),
+					await (queries.GetResultAsync<ReadOnly>(1)),
 					Has.Count.EqualTo(1).And.One.Property(nameof(ReadOnly.Name)).EqualTo(name2), "q2");
 				Assert.That(
-					await (queries.GetResultAsync<ReadWrite>(2, CancellationToken.None)),
+					await (queries.GetResultAsync<ReadWrite>(2)),
 					Has.Count.EqualTo(1).And.One.Property(nameof(ReadWrite.Name)).EqualTo(name3), "q3");
 				Assert.That(
-					await (queries.GetResultAsync<ReadWrite>(3, CancellationToken.None)),
+					await (queries.GetResultAsync<ReadWrite>(3)),
 					Has.Count.EqualTo(1).And.One.Property(nameof(ReadWrite.Name)).EqualTo(name4), "q4");
 				Assert.That(
-					await (queries.GetResultAsync<ReadOnly>(4, CancellationToken.None)),
+					await (queries.GetResultAsync<ReadOnly>(4)),
 					Has.Count.EqualTo(1).And.One.Property(nameof(ReadOnly.Name)).EqualTo(name5), "q5");
 
 				Assert.That(cache.GetMultipleCalls, Has.Count.EqualTo(2), "cache GetMany secondExecution");
@@ -1174,24 +1174,24 @@ public async Task QueryCacheTestAsync()
 				// Run a third time, to re-test the query cache
 				using (var t = s.BeginTransaction())
 				{
-					await (queries.ExecuteAsync(CancellationToken.None));
+					await (queries.ExecuteAsync());
 					await (t.CommitAsync());
 				}
 
 				Assert.That(
-					await (queries.GetResultAsync<ReadOnly>(0, CancellationToken.None)),
+					await (queries.GetResultAsync<ReadOnly>(0)),
 					Has.Count.EqualTo(1).And.One.Property(nameof(ReadOnly.Name)).EqualTo(name1), "q1 after update");
 				Assert.That(
-					await (queries.GetResultAsync<ReadOnly>(1, CancellationToken.None)),
+					await (queries.GetResultAsync<ReadOnly>(1)),
 					Has.Count.EqualTo(1).And.One.Property(nameof(ReadOnly.Name)).EqualTo(name2), "q2 after update");
 				Assert.That(
-					await (queries.GetResultAsync<ReadWrite>(2, CancellationToken.None)),
+					await (queries.GetResultAsync<ReadWrite>(2)),
 					Has.Count.EqualTo(0), "q3 after update");
 				Assert.That(
-					await (queries.GetResultAsync<ReadWrite>(3, CancellationToken.None)),
+					await (queries.GetResultAsync<ReadWrite>(3)),
 					Has.Count.EqualTo(1).And.One.Property(nameof(ReadWrite.Name)).EqualTo(name4), "q4 after update");
 				Assert.That(
-					await (queries.GetResultAsync<ReadOnly>(4, CancellationToken.None)),
+					await (queries.GetResultAsync<ReadOnly>(4)),
 					Has.Count.EqualTo(1).And.One.Property(nameof(ReadOnly.Name)).EqualTo(name5), "q5 after update");
 
 				Assert.That(cache.GetMultipleCalls, Has.Count.EqualTo(3), "cache GetMany thirdExecution");

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

@@ -11,6 +11,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using NHibernate.Dialect;
 using NHibernate.Criterion;
 using NHibernate.Linq;
@@ -2085,6 +2086,64 @@ public async Task RestrictionOnSubclassCollectionAsync()
 			s.Close();
 		}
 
+		//NH-2239 (GH-1075) - Wrong OrderBy in generated SQL
+		[Test]
+		public async Task OrderByAndOrderedCollectionAsync()
+		{
+			var reptile1 = new Reptile { SerialNumber = "9" };
+			var reptile2 = new Reptile { SerialNumber = "8" };
+			var reptile3 = new Reptile { SerialNumber = "7" };
+			var reptile4 = new Reptile { SerialNumber = "6" };
+			var reptile5 = new Reptile { SerialNumber = "5" };
+
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				await (s.SaveAsync(reptile5));
+				await (s.SaveAsync(reptile1));
+				await (s.SaveAsync(reptile2));
+				await (s.SaveAsync(reptile3));
+				await (s.SaveAsync(reptile4));
+
+				reptile1.AddOffspring(reptile4);
+				reptile1.AddOffspring(reptile2);
+				reptile4.Father = reptile3;
+				reptile2.Father = reptile4;
+				reptile1.Father = reptile5;
+				reptile3.AddOffspring(reptile1);
+
+				await (t.CommitAsync());
+			}
+
+			using(var s = OpenSession())
+			{
+				var list = await (s.CreateCriteria(typeof(Reptile))
+							.Fetch(SelectMode.Fetch, "offspring")
+							.AddOrder(Order.Asc("serialNumber"))
+							.SetResultTransformer(Transformers.DistinctRootEntity)
+							.ListAsync<Reptile>());
+
+				var expectedList = list.OrderBy(x => x.SerialNumber).ToList();
+
+				Assert.That(list.Count, Is.EqualTo(5));
+				CollectionAssert.AreEqual(expectedList, list);
+
+				var mother = expectedList.Last();
+				Assert.That(NHibernateUtil.IsInitialized(mother.Offspring), Is.True);
+
+				var expectedAssociationList = mother.Offspring.OrderBy(r => r.Father.Id).ToList();
+				Assert.That(expectedAssociationList.Count, Is.EqualTo(2));
+				CollectionAssert.AreEqual(expectedAssociationList, mother.Offspring);
+			}
+
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				await (s.DeleteAsync("from Reptile"));
+				await (t.CommitAsync());
+			}
+		}
+
 		[Test]
 		public async Task ClassPropertyAsync()
 		{
@@ -2441,6 +2500,22 @@ public async Task SubcriteriaJoinTypesAsync()
 			session.Close();
 		}
 
+		public class NotMappedEntity
+		{
+			public  virtual  int Id { get; set; }
+			public  virtual  string Name { get; set; }
+		}
+
+		[Test]
+		public void CriteriaOnNotMappedEntityAsync()
+		{
+			using (ISession session = OpenSession())
+			{
+				Assert.ThrowsAsync<QueryException>(
+					() => session.CreateCriteria(typeof(NotMappedEntity)).ListAsync());
+			}
+		}
+
 		[Test]
 		public void TypeMismatchAsync()
 		{

src/NHibernate.Test/Async/Criteria/Lambda/IntegrationFixture.cs

@@ -428,8 +428,8 @@ public async Task MultiQueryAsync()
 					 .Add("page", query)
 					 .Add<int>("count", query.ToRowCountQuery());
 
-				var pageResults = await (multiQuery.GetResultAsync<Person>("page", CancellationToken.None));
-				var countResults = await (multiQuery.GetResultAsync<int>("count", CancellationToken.None));
+				var pageResults = await (multiQuery.GetResultAsync<Person>("page"));
+				var countResults = await (multiQuery.GetResultAsync<int>("count"));
 
 				Assert.That(pageResults.Count, Is.EqualTo(1));
 				Assert.That(pageResults[0].Name, Is.EqualTo("Name 3"));
@@ -451,8 +451,8 @@ public async Task MultiQueryAsync()
 					 .Add("page", query)
 					 .Add<int>("count", query.ToRowCountQuery());
 
-				var pageResults = await (multiCriteria.GetResultAsync<Person>("page", CancellationToken.None));
-				var countResults = await (multiCriteria.GetResultAsync<int>("count", CancellationToken.None));
+				var pageResults = await (multiCriteria.GetResultAsync<Person>("page"));
+				var countResults = await (multiCriteria.GetResultAsync<int>("count"));
 
 				Assert.That(pageResults.Count, Is.EqualTo(1));
 				Assert.That(pageResults[0].Name, Is.EqualTo("Name 3"));