Merge branch '5.3.x' into RM2792

Author: hazzik

.github/workflows/NetCoreTests.yml

@@ -0,0 +1,57 @@
+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;"
+            ALLOW_FAILURE: 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 microsoft/mssql-server-linux: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
+
+    - 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/[email protected]
+      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

@@ -3,9 +3,9 @@
 
   <PropertyGroup>
     <NhVersion     Condition="'$(NhVersion)' == ''"    >5.3</NhVersion>
-    <VersionPatch  Condition="'$(VersionPatch)'  == ''">8</VersionPatch>
+    <VersionPatch  Condition="'$(VersionPatch)'  == ''">9</VersionPatch>
     <!-- Clear VersionSuffix for making release and set it to dev for making development builds -->
-    <VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
+    <VersionSuffix Condition="'$(VersionSuffix)' == ''">dev</VersionSuffix>
 
     <VersionPrefix Condition="'$(VersionPrefix)' == ''">$(NhVersion).$(VersionPatch)</VersionPrefix>
     <VersionSuffix Condition="'$(VersionSuffix)' != '' AND '$(BuildNumber)' != ''">$(VersionSuffix).$(BuildNumber)</VersionSuffix>

build-common/NHibernate.props

@@ -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

@@ -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

@@ -63,7 +63,7 @@
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
-    <PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="6.3.0" />
+    <PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="6.6.0" />
     <PackageReference Include="Npgsql" Version="4.0.3" />
   </ItemGroup>
   <ItemGroup Condition="$(NhNetFx)">

src/NHibernate.Test/NHibernate.Test.csproj

@@ -49,6 +49,16 @@ public void TestInitialization()
 			Assert.That(sn.TryGetValue(null, out _), Is.True);
 		}
 
+		[Test]
+		public void TestDuplicates()
+		{
+			var list = new List<string> { "test1", "test1", "test2" };
+			var sn = new SetSnapShot<string>(list);
+			Assert.That(sn, Has.Count.EqualTo(2));
+			Assert.That(sn.TryGetValue("test1", out _), Is.True);
+			Assert.That(sn.TryGetValue("test2", out _), Is.True);
+		}
+
 		[Test]
 		public void TestCopyTo()
 		{

src/NHibernate.Test/UtilityTest/SetSnapShotFixture.cs

@@ -33,7 +33,7 @@ public SetSnapShot(IEnumerable<T> collection)
 				}
 				else
 				{
-					_values.Add(item, item);
+					_values[item] = item;
 				}
 			}
 		}
@@ -70,7 +70,7 @@ public void Add(T item)
 				return;
 			}
 
-			_values.Add(item, item);
+			_values[item] = item;
 		}
 
 		public void Clear()

src/NHibernate/Collection/Generic/SetHelpers/SetSnapShot.cs

@@ -160,8 +160,8 @@ public void ClearPool(string connectionString)
 				using (var clearConnection = CreateConnection())
 				{
 					var connectionType = clearConnection.GetType();
-					_clearPool = connectionType.GetMethod("ClearPool") ?? throw new InvalidOperationException("Unable to resolve ClearPool method.");
-					_clearAllPools = connectionType.GetMethod("ClearAllPools") ?? throw new InvalidOperationException("Unable to resolve ClearAllPools method.");
+					_clearPool = connectionType.GetMethod("ClearPool", new[] { connectionType }) ?? throw new InvalidOperationException("Unable to resolve ClearPool method.");
+					_clearAllPools = connectionType.GetMethod("ClearAllPools", Array.Empty<System.Type>()) ?? throw new InvalidOperationException("Unable to resolve ClearAllPools method.");
 				}
 			}
 

src/NHibernate/Driver/FirebirdClientDriver.cs

@@ -389,7 +389,7 @@ private void DereferenceEntity(EntityType entityType, bool implicitJoin, string
 			//For nullable entity comparisons we always need to add join (like not constrained one-to-one or not-found ignore associations)
 			//NOTE: This fix is not fully correct. It doesn't work for comparisons with null (where e.OneToOneProp is null)
 			// as by default implicit join is generated and to work propelry left join is required (see GH-2611)
-			bool comparisonWithNullableEntity = false;
+			bool comparisonWithNullableEntity = entityType.IsNullable && Walker.IsComparativeExpressionClause;
 
 			if ( IsDotNode( parent ) ) 
 			{
@@ -398,7 +398,7 @@ private void DereferenceEntity(EntityType entityType, bool implicitJoin, string
 				// entity's PK (because 'our' table would know the FK).
 				parentAsDotNode = ( DotNode ) parent;
 				property = parentAsDotNode._propertyName;
-				joinIsNeeded = generateJoin && ((Walker.IsSelectStatement && entityType.IsNullable) || !IsReferenceToPrimaryKey( parentAsDotNode._propertyName, entityType ));
+				joinIsNeeded = generateJoin && ((Walker.IsSelectStatement && comparisonWithNullableEntity) || !IsReferenceToPrimaryKey( parentAsDotNode._propertyName, entityType ));
 			}
 			else if ( ! Walker.IsSelectStatement ) 
 			{
@@ -411,7 +411,6 @@ private void DereferenceEntity(EntityType entityType, bool implicitJoin, string
 			}
 			else
 			{
-				comparisonWithNullableEntity = (Walker.IsComparativeExpressionClause && entityType.IsNullable);
 				joinIsNeeded = generateJoin || (Walker.IsInSelect && !Walker.IsInCase) || (Walker.IsInFrom && !Walker.IsComparativeExpressionClause)
 				               || comparisonWithNullableEntity;
 			}

src/NHibernate/Hql/Ast/ANTLR/Tree/DotNode.cs

@@ -1483,14 +1483,6 @@ public void Reconnect(DbConnection conn)
 		private string fetchProfile;
 		private IDisposable _context;
 
-		/// <summary>
-		/// Finalizer that ensures the object is correctly disposed of.
-		/// </summary>
-		~SessionImpl()
-		{
-			Dispose(false);
-		}
-
 		/// <summary>
 		/// Perform a soft (distributed transaction aware) close of the session
 		/// </summary>
@@ -1517,15 +1509,12 @@ public void Dispose()
 			_context?.Dispose();
 		}
 
+		//TODO: Get rid of isDisposing parameter. Finalizer is removed as not needed, so isDisposing  is always true
 		/// <summary>
 		/// Takes care of freeing the managed and unmanaged resources that
 		/// this class is responsible for.
 		/// </summary>
 		/// <param name="isDisposing">Indicates if this Session is being Disposed of or Finalized.</param>
-		/// <remarks>
-		/// If this Session is being Finalized (<c>isDisposing==false</c>) then make sure not
-		/// to call any methods that could potentially bring this Session back to life.
-		/// </remarks>
 		private void Dispose(bool isDisposing)
 		{
 			using (BeginContext())
@@ -1546,8 +1535,6 @@ private void Dispose(bool isDisposing)
 					{
 						Close();
 					}
-					// nothing for Finalizer to do - so tell the GC to ignore it
-					GC.SuppressFinalize(this);
 				}
 
 				// free unmanaged resources here

src/NHibernate/Impl/SessionImpl.cs

@@ -759,14 +759,6 @@ public IQueryOver<T, T> QueryOver<T>(Expression<Func<T>> alias) where T : class
 		private bool _isAlreadyDisposed;
 		private IDisposable _context;
 
-		/// <summary>
-		/// Finalizer that ensures the object is correctly disposed of.
-		/// </summary>
-		~StatelessSessionImpl()
-		{
-			Dispose(false);
-		}
-
 		///<summary>
 		///Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
 		///</summary>
@@ -793,6 +785,7 @@ public void Dispose()
 			}
 		}
 
+		//TODO: Get rid of isDisposing parameter. Finalizer is removed as not needed, so isDisposing  is always true
 		protected void Dispose(bool isDisposing)
 		{
 			using (BeginContext())
@@ -811,9 +804,6 @@ protected void Dispose(bool isDisposing)
 					{
 						Close();
 					}
-
-					// nothing for Finalizer to do - so tell the GC to ignore it
-					GC.SuppressFinalize(this);
 				}
 
 				// free unmanaged resources here