Merge 5.3.9

# Conflicts:
#	.travis.yml
#	build-common/NHibernate.props
#	src/NHibernate.Test/NHibernate.Test.csproj
#	src/NHibernate/Linq/Visitors/QueryModelVisitor.cs

# Adjusted:
#	.github/workflows/NetCoreTest.yml

Author: fredericDelaporte

.github/workflows/NetCoreTests.yml

@@ -0,0 +1,56 @@
+name: .NET Core
+
+on: [push, pull_request]
+
+jobs:
+  db:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - DB: SqlServer2008
+            CONNECTION_STRING: "Server=localhost;initial catalog=nhibernate;User Id=sa;Password=P@ssw0rd;packet size=4096;"
+          - DB: PostgreSQL
+            CONNECTION_STRING: "Host=localhost;Username=nhibernate;Password=nhibernate;Database=nhibernate;Enlist=true;"
+          - DB: Firebird
+            CONNECTION_STRING: "DataSource=localhost;Database=nhibernate;User=SYSDBA;Password=nhibernate;charset=utf8;"
+          - DB: MySQL
+            CONNECTION_STRING: "Server=localhost;Uid=root;Password=nhibernate;Database=nhibernate;Old Guids=True;"
+          - DB: SQLite
+    runs-on: ubuntu-latest
+    continue-on-error: ${{matrix.ALLOW_FAILURE == true}}
+    env:
+      LANG: en-US.UTF-8 #default POSIX locale doesn't support ignore case comparisons
+    name: ${{matrix.DB}}
+
+    steps:
+    - name: Set up SqlServer
+      if: matrix.DB == 'SqlServer2008'
+      run: |
+        docker run -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=P@ssw0rd" -e "MSSQL_PID=Express" -p 1433:1433 -d --name sqlexpress mcr.microsoft.com/mssql/server:2019-latest;
+
+    - name: Set up MySQL
+      if: matrix.DB == 'MySQL'
+      run: |
+        sudo service mysql stop
+        docker run --name mysql -e MYSQL_ROOT_PASSWORD=nhibernate -e MYSQL_USER=nhibernate -e MYSQL_PASSWORD=nhibernate -e MYSQL_DATABASE=nhibernate -p 3306:3306 --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 -d mysql:5.7 mysqld --lower_case_table_names=1 --character-set-server=utf8 --collation-server=utf8_general_ci
+
+    - name: Set up PostgreSQL
+      if: matrix.DB == 'PostgreSQL'
+      run: |
+       docker run -d -e POSTGRES_USER=nhibernate  -e POSTGRES_PASSWORD=nhibernate -e POSTGRES_DB=nhibernate -p 5432:5432 postgres:13
+
+    - name: Set up Firebird
+      if: matrix.DB == 'Firebird'
+      run: |
+        docker run --name firebird -e EnableWireCrypt=true -e FIREBIRD_USER=nhibernate -e FIREBIRD_PASSWORD=nhibernate -e ISC_PASSWORD=nhibernate -e FIREBIRD_DATABASE=nhibernate -p 3050:3050 -d jacobalberty/firebird:v3.0
+
+    - uses: actions/checkout@v2
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v1.8.0
+      with:
+        dotnet-version: 2.1.x
+
+    - name: Build and Test
+      run: |
+        pwsh -noprofile -command "& ./build.ps1 -TaskList Set-Configuration,Test -properties @{'Database' = '${{matrix.DB}}';'ConnectionString'='${{matrix.CONNECTION_STRING}}'}"

.travis.yml

@@ -1,4 +1,31 @@
-Build 5.3.8
+Build 5.3.9
+=============================
+
+Release notes - NHibernate - Version 5.3.9
+
+11 issues were resolved in this release.
+
+** Bug
+
+   * #2835 Fix ExecuteWorkInIsolation ignores MultiTenancy configuration
+   * #2811 Remove session finalizer
+   * #2805 Model not mapped Exception
+   * #2802 ArgumentException on session Flush
+   * #2792 Arithmetic operations adding casts to SQLite that cause incorrect results
+   * #2791 Custom Equality Fails
+   * #2772 LINQ query returns NULL instead of expected result
+
+** Test
+
+   * #2841 Fix possible test failure for SqlServer 2019
+   * #2814 Fix intermittent Firebird test errors
+   * #2812 Replace Travis CI with GitHub Actions
+
+** Task
+
+   * #2837 Release 5.3.9
+
+Build 5.3.8
 =============================
 
 Release notes - NHibernate - Version 5.3.8

releasenotes.txt

@@ -9,11 +9,13 @@
 
 
 using System;
+using System.Linq;
 using System.Text.RegularExpressions;
 using NHibernate.Cfg.MappingSchema;
 using NHibernate.Mapping.ByCode;
 using NHibernate.Test.Hql.EntityJoinHqlTestEntities;
 using NUnit.Framework;
+using NHibernate.Linq;
 
 namespace NHibernate.Test.Hql
 {
@@ -287,6 +289,24 @@ public async Task NullableOneToOneFetchQueryIsNotAffected2Async()
 			}
 		}
 
+		[Test(Description = "GH-2772")]
+		public async Task NullableEntityProjectionAsync()
+		{
+			using (var session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				var nullableOwner1 = new NullableOwner {Name = "1", ManyToOne = await (session.LoadAsync<OneToOneEntity>(Guid.NewGuid()))};
+				var nullableOwner2 = new NullableOwner {Name = "2"};
+				await (session.SaveAsync(nullableOwner1));
+				await (session.SaveAsync(nullableOwner2));
+
+				var fullList = await (session.Query<NullableOwner>().Select(x => new {x.Name, ManyToOneId = (Guid?) x.ManyToOne.Id}).ToListAsync());
+				var withValidManyToOneList = await (session.Query<NullableOwner>().Where(x => x.ManyToOne != null).Select(x => new {x.Name, ManyToOneId = (Guid?) x.ManyToOne.Id}).ToListAsync());
+				Assert.That(fullList.Count, Is.EqualTo(2));
+				Assert.That(withValidManyToOneList.Count, Is.EqualTo(0));
+			}
+		}
+
 		[Test]
 		public async Task EntityJoinWithEntityComparisonInWithClausShouldNotAddJoinAsync()
 		{

src/NHibernate.Test/Async/Hql/EntityJoinHqlTest.cs

@@ -156,5 +156,14 @@ public async Task CanInnerJoinOnSubclassWithBaseTableReferenceInOnClauseAsync()
 			              join o2 in db.Mammals on o.BodyWeight equals o2.BodyWeight
 			              select new { o, o2 }).Take(1).ToListAsync());
 		}
+
+		[Test(Description = "GH-2805")]
+		public async Task CanJoinOnInterfaceAsync()
+		{
+			var result = await (db.IUsers.Join(db.IUsers,
+									u => u.Id,
+									iu => iu.Id,
+									(u, iu) => iu.Name).Take(1).ToListAsync());
+		}
 	}
 }

src/NHibernate.Test/Async/Linq/ByMethod/JoinTests.cs

@@ -14,6 +14,7 @@
 using System.Reflection;
 using System.Text.RegularExpressions;
 using NHibernate.Cfg;
+using NHibernate.DomainModel.Northwind.Entities;
 using NHibernate.Hql.Ast;
 using NHibernate.Linq.Functions;
 using NHibernate.Linq.Visitors;
@@ -33,6 +34,14 @@ protected override void Configure(NHibernate.Cfg.Configuration configuration)
 			configuration.LinqToHqlGeneratorsRegistry<MyLinqToHqlGeneratorsRegistry>();
 		}
 
+		[Test]
+		public async Task CanUseObjectEqualsAsync()
+		{
+			var users = await (db.Users.Where(o => ((object) EnumStoredAsString.Medium).Equals(o.NullableEnum1)).ToListAsync());
+			Assert.That(users.Count, Is.EqualTo(2));
+			Assert.That(users.All(c => c.NullableEnum1 == EnumStoredAsString.Medium), Is.True);
+		}
+
 		[Test]
 		public async Task CanUseMyCustomExtensionAsync()
 		{

src/NHibernate.Test/Async/Linq/CustomExtensionsExample.cs

@@ -16,6 +16,7 @@
 using NHibernate.Hql.Ast.ANTLR;
 using NHibernate.Linq;
 using NSubstitute;
+using NSubstitute.ExceptionExtensions;
 using NUnit.Framework;
 
 namespace NHibernate.Test.Linq
@@ -1397,5 +1398,19 @@ from s2 in sup2.DefaultIfEmpty()
 				Assert.That(GetTotalOccurrences(sql, "left outer join"), Is.EqualTo(2));
 			}
 		}
+
+		[Test]
+		public void ReplaceFunctionWithNullArgumentAsync()
+		{
+			var query = from e in db.Employees
+			            select e.FirstName.Replace(e.LastName, null);
+			List<string> results = null;
+			Assert.That(
+				async () =>
+				{
+					results = await (query.ToListAsync());
+				}, Throws.Nothing, "Expected REPLACE(FirstName, LastName, NULL) to be supported");
+			Assert.That(results, Is.Not.Null);
+		}
 	}
 }

src/NHibernate.Test/Async/Linq/LinqQuerySamples.cs

@@ -35,6 +35,20 @@ public async Task UnaryMinusAsync()
 			Assert.AreEqual(1, await (session.Query<TimesheetEntry>().CountAsync(a => -a.NumberOfHours == -7)));
 		}
 
+		[Test]
+		public async Task DecimalAddAsync()
+		{
+			decimal offset = 5.5m;
+			decimal test = 10248 + offset;
+			var result = await (session.Query<Order>().Where(e => offset + e.OrderId == test).ToListAsync());
+			Assert.That(result, Has.Count.EqualTo(1));
+
+			offset = 5.5m;
+			test = 32.38m + offset;
+			result = await (session.Query<Order>().Where(e => offset + e.Freight == test).ToListAsync());
+			Assert.That(result, Has.Count.EqualTo(1));
+		}
+
 		[Test]
 		public async Task UnaryPlusAsync()
 		{

src/NHibernate.Test/Async/Linq/OperatorTests.cs

@@ -320,7 +320,7 @@ public async Task CompareFloatingPointParametersAndColumnsAsync()
 					totalParameters,
 					sql =>
 					{
-						Assert.That(sql, Does.Not.Contain("cast"));
+						Assert.That(sql, pair.Value == "Decimal" && Dialect.IsDecimalStoredAsFloatingPointNumber ? Does.Contain("cast") : Does.Not.Contain("cast"));
 						Assert.That(GetTotalOccurrences(sql, $"Type: {pair.Value}"), Is.EqualTo(totalParameters));
 					}));
 			}

src/NHibernate.Test/Async/Linq/ParameterTests.cs

@@ -19,6 +19,7 @@
 using NHibernate.Dialect;
 using NHibernate.Driver;
 using NHibernate.Engine;
+using NHibernate.Engine.Transaction;
 using NHibernate.Linq;
 using NHibernate.Mapping.ByCode;
 using NHibernate.MultiTenancy;
@@ -28,6 +29,7 @@
 namespace NHibernate.Test.MultiTenancy
 {
 	using System.Threading.Tasks;
+	using System.Threading;
 	[TestFixture]
 	public class DatabaseStrategyNoDbSpecificFixtureAsync : TestCaseMappingByCode
 	{
@@ -160,6 +162,18 @@ public async Task TenantSessionIsSerializableAndCanBeReconnectedAsync()
 			Assert.That(Sfi.Statistics.SecondLevelCacheHitCount, Is.EqualTo(1));
 		}
 
+		[Test]
+		public async Task TenantIsolatedWorkOpensTenantConnectionAsync()
+		{
+			if (!IsSqlServerDialect)
+				Assert.Ignore("MSSqlServer specific test");
+
+			using (var ses = OpenTenantSession("tenant1"))
+			{
+				await (Isolater.DoIsolatedWorkAsync(new TenantIsolatatedWork("tenant1"), ses.GetSessionImplementation(), CancellationToken.None));
+			}
+		}
+
 		private static string GetTenantId(ISession session)
 		{
 			return session.GetSessionImplementation().GetTenantIdentifier();

src/NHibernate.Test/Async/MultiTenancy/DatabaseStrategyNoDbSpecificFixture.cs

@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by AsyncGenerator.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+
+using System.Data.Common;
+using System.Data.SqlClient;
+using NHibernate.Engine.Transaction;
+
+namespace NHibernate.Test.MultiTenancy
+{
+	using System.Threading.Tasks;
+	using System.Threading;
+	public partial class TenantIsolatatedWork : IIsolatedWork
+	{
+
+		public Task DoWorkAsync(DbConnection connection, DbTransaction transaction, CancellationToken cancellationToken)
+		{
+			var builder = new SqlConnectionStringBuilder(connection.ConnectionString);
+			if (builder.ApplicationName != _tenantName)
+				return Task.FromException<object>(new HibernateException("Invalid tenant connection"));
+			return Task.CompletedTask;
+		}
+	}
+}

src/NHibernate.Test/Async/MultiTenancy/TenantIsolatatedWork.cs

@@ -114,7 +114,9 @@ public void InsertWithTooLongValuesShouldThrowAsync()
 
 				var sqlEx = ex.InnerException as SqlException;
 				Assert.That(sqlEx, Is.Not.Null);
-				Assert.That(sqlEx.Number, Is.EqualTo(8152));
+				// Error code is different if verbose truncation warning is enabled
+				// See details: https://www.brentozar.com/archive/2019/03/how-to-fix-the-error-string-or-binary-data-would-be-truncated/
+				Assert.That(sqlEx.Number, Is.EqualTo(8152).Or.EqualTo(2628));
 			}
 		}
 

src/NHibernate.Test/Async/NHSpecificTest/GH1300/Fixture.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Text.RegularExpressions;
 using NHibernate.Cfg.MappingSchema;
 using NHibernate.Mapping.ByCode;
@@ -276,6 +277,24 @@ public void NullableOneToOneFetchQueryIsNotAffected2()
 			}
 		}
 
+		[Test(Description = "GH-2772")]
+		public void NullableEntityProjection()
+		{
+			using (var session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				var nullableOwner1 = new NullableOwner {Name = "1", ManyToOne = session.Load<OneToOneEntity>(Guid.NewGuid())};
+				var nullableOwner2 = new NullableOwner {Name = "2"};
+				session.Save(nullableOwner1);
+				session.Save(nullableOwner2);
+
+				var fullList = session.Query<NullableOwner>().Select(x => new {x.Name, ManyToOneId = (Guid?) x.ManyToOne.Id}).ToList();
+				var withValidManyToOneList = session.Query<NullableOwner>().Where(x => x.ManyToOne != null).Select(x => new {x.Name, ManyToOneId = (Guid?) x.ManyToOne.Id}).ToList();
+				Assert.That(fullList.Count, Is.EqualTo(2));
+				Assert.That(withValidManyToOneList.Count, Is.EqualTo(0));
+			}
+		}
+
 		[Test]
 		public void EntityJoinWithEntityComparisonInWithClausShouldNotAddJoin()
 		{

src/NHibernate.Test/Hql/EntityJoinHqlTest.cs

@@ -145,5 +145,14 @@ public void CanInnerJoinOnSubclassWithBaseTableReferenceInOnClause()
 			              join o2 in db.Mammals on o.BodyWeight equals o2.BodyWeight
 			              select new { o, o2 }).Take(1).ToList();
 		}
+
+		[Test(Description = "GH-2805")]
+		public void CanJoinOnInterface()
+		{
+			var result = db.IUsers.Join(db.IUsers,
+									u => u.Id,
+									iu => iu.Id,
+									(u, iu) => iu.Name).Take(1).ToList();
+		}
 	}
 }