Merge branch 'master' of https://github.com/nhibernate/nhibernate-core into dbbatch

Author: hazzik

.editorconfig

@@ -25,8 +25,6 @@ dotnet_diagnostic.NUnit2006.severity = suggestion
 dotnet_diagnostic.NUnit2015.severity = suggestion
 dotnet_diagnostic.NUnit2031.severity = suggestion
 dotnet_diagnostic.NUnit2049.severity = suggestion
-# NUnit 4 no longer supports string.Format specification for Assert
-dotnet_diagnostic.NUnit2050.severity = suggestion
 # The SameAs constraint always fails on value types as the actual and the expected value cannot be the same reference
 dotnet_diagnostic.NUnit2040.severity = suggestion
 dotnet_diagnostic.CA1849.severity = error
@@ -40,17 +38,10 @@ indent_style = tab
 indent_style = space
 indent_size = 2
 
-[*.xml]
-indent_style = space
-indent_size = 2
-
-[*.csproj]
-indent_style = space
-indent_size = 2
-
-[*.vbproj]
+[{*.xml,*.csproj,*.vbproj}]
 indent_style = space
 indent_size = 2
+ij_xml_space_inside_empty_tag = true
 
 [*.g]
 indent_style = tab

Tools/packages.csproj

@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit.Console" Version="3.16.3" />
+    <PackageReference Include="NUnit.Console" Version="3.17.0" />
   </ItemGroup>
 
 </Project>

releasenotes.txt

@@ -1,4 +1,21 @@
-Build 5.5.0
+Build 5.5.1
+=============================
+
+Release notes - NHibernate - Version 5.5.1
+
+3 issues were resolved in this release.
+
+** Bug
+
+   * #3465 Invalid SQL created for some joins in a subquery
+
+** Task
+
+   * #3509 Release 5.5.1
+   * #3508 Merge 5.4.8 into 5.5.x
+
+
+Build 5.5.0
 =============================
 
 Release notes - NHibernate - Version 5.5.0
@@ -88,6 +105,22 @@ Release notes - NHibernate - Version 5.5.0
    * #3412 Revive hql ParsingFixture
 
 
+Build 5.4.8
+=============================
+
+Release notes - NHibernate - Version 5.4.8
+
+2 issues were resolved in this release.
+
+** Bug
+
+   * #3489 Inserting multiple associations of the same entity fails
+
+** Task
+
+   * #3507 Release 5.4.8
+
+
 Build 5.4.7
 =============================
 

src/NHibernate.Test/Async/BulkManipulation/HQLBulkOperations.cs

@@ -43,5 +43,21 @@ public async Task SimpleDeleteAsync()
 				await (tx.CommitAsync());
 			}
 		}
+
+		[Test]
+		public async Task InsertFromSelectWithMultipleAssociationsAsync()
+		{
+			Assume.That(TestDialect.NativeGeneratorSupportsBulkInsertion,
+				"The dialect does not support a native generator compatible with bulk insertion.");
+
+			using var s = OpenSession();
+			using var tx = s.BeginTransaction();
+
+			await (s.CreateQuery("insert into Enrolment (Course, Student)" +
+				" select e.Course, e.Student from Enrolment e")
+				.ExecuteUpdateAsync());
+
+			await (tx.CommitAsync());
+		}
 	}
-}
+}

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

@@ -358,7 +358,7 @@ public async Task MultiCriteriaAsync()
 		{
 			var driver = Sfi.ConnectionProvider.Driver;
 			if (!driver.SupportsMultipleQueries)
-				Assert.Ignore("Driver {0} does not support multi-queries", driver.GetType().FullName);
+				Assert.Ignore($"Driver {driver.GetType().FullName} does not support multi-queries");
 
 			await (SetupPagingDataAsync());
 

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

@@ -91,7 +91,7 @@ public async Task UsingSqlFunctions_Concat_WithCastAsync()
 		{
 			if(Dialect is Oracle8iDialect)
 			{
-				Assert.Ignore("Not supported by the active dialect:{0}.", Dialect);
+				Assert.Ignore($"Not supported by the active dialect:{Dialect}.");
 			}
 			if (TestDialect.HasBrokenTypeInferenceOnSelectedParameters)
 				Assert.Ignore("Current dialect does not support this test");

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

@@ -663,7 +663,7 @@ public async Task FetchModeEagerForEagerAsync()
 		private void SkipFutureTestIfNotSupported()
 		{
 			if (Sfi.ConnectionProvider.Driver.SupportsMultipleQueries == false)
-				Assert.Ignore("Driver {0} does not support multi-queries", Sfi.ConnectionProvider.Driver.GetType().FullName);
+				Assert.Ignore($"Driver {Sfi.ConnectionProvider.Driver.GetType().FullName} does not support multi-queries");
 		}
 
 		#region Test Setup

src/NHibernate.Test/Async/Extralazy/ExtraLazyFixture.cs

@@ -114,7 +114,7 @@ public async Task ListAddAsync(bool initialize)
 				// Have to skip unloaded (non-queued indeed) elements to avoid triggering existence queries on them.
 				foreach (var item in addedItems.Skip(5))
 				{
-					Assert.That(gavin.Companies.Contains(item), Is.True, "Company '{0}' existence", item.Name);
+					Assert.That(gavin.Companies.Contains(item), Is.True, $"Company '{item.Name}' existence");
 				}
 
 				Assert.That(Sfi.Statistics.FlushCount, Is.EqualTo(0), "Flushes count after checking existence of non-flushed");
@@ -322,7 +322,7 @@ public async Task ListInsertAsync(bool initialize)
 				// Have to skip unloaded (non-queued indeed) elements to avoid triggering existence queries on them.
 				foreach (var item in addedItems.Skip(5))
 				{
-					Assert.That(gavin.Companies.Contains(item), Is.True, "Company '{0}' existence", item.Name);
+					Assert.That(gavin.Companies.Contains(item), Is.True, $"Company '{item.Name}' existence");
 				}
 
 				Assert.That(Sfi.Statistics.FlushCount, Is.EqualTo(0), "Flushes count after existence check");
@@ -636,7 +636,7 @@ public async Task ListGetSetAsync(bool initialize)
 				Sfi.Statistics.Clear();
 				for (var i = 0; i < 10; i++)
 				{
-					Assert.That(gavin.Companies[i], Is.EqualTo(addedItems[i]), "Comparing added company at index {0}", i);
+					Assert.That(gavin.Companies[i], Is.EqualTo(addedItems[i]), $"Comparing added company at index {i}");
 				}
 
 				Assert.That(Sfi.Statistics.FlushCount, Is.EqualTo(0), "Flushes count after adding comparing");
@@ -676,7 +676,7 @@ public async Task ListGetSetAsync(bool initialize)
 				Sfi.Statistics.Clear();
 				for (var i = 0; i < 10; i++)
 				{
-					Assert.That(gavin.Companies[i].ListIndex, Is.EqualTo(finalIndexOrder[i]), "Comparing company ListIndex at index {0}", i);
+					Assert.That(gavin.Companies[i].ListIndex, Is.EqualTo(finalIndexOrder[i]), $"Comparing company ListIndex at index {i}");
 				}
 
 				Assert.That(Sfi.Statistics.FlushCount, Is.EqualTo(0), "Flushes count after comparing");
@@ -798,7 +798,7 @@ public async Task ListFlushAsync(bool initialize)
 				{
 					for (var i = 15; i < 20; i++)
 					{
-						Assert.That(gavin.Companies.Remove(addedItems[i]), Is.True, "Removing transient company at index {0}", i);
+						Assert.That(gavin.Companies.Remove(addedItems[i]), Is.True, $"Removing transient company at index {i}");
 					}
 
 					Assert.That(FindAllOccurrences(sqlLog.GetWholeLog(), "INSERT \n    INTO"), Is.EqualTo(10), "Statements count after removing");
@@ -909,7 +909,7 @@ public async Task ListFlushAsync(bool initialize)
 
 				for (var i = 0; i < gavin.Companies.Count; i++)
 				{
-					Assert.That(gavin.Companies[i].ListIndex, Is.EqualTo(i), "Comparing company ListIndex at index {0}", i);
+					Assert.That(gavin.Companies[i].ListIndex, Is.EqualTo(i), $"Comparing company ListIndex at index {i}");
 				}
 
 				if (initialize)
@@ -1049,7 +1049,7 @@ public async Task ListClearAsync(bool initialize)
 				Assert.That(collection.Count, Is.EqualTo(6), "Credit cards count after loading again Gavin");
 				for (var i = 0; i < 10; i++)
 				{
-					Assert.That(collection.Contains(addedItems[i]), i < 6 ? Is.True : (IResolveConstraint) Is.False, "Checking existence for item at {0}", i);
+					Assert.That(collection.Contains(addedItems[i]), i < 6 ? Is.True : (IResolveConstraint) Is.False, $"Checking existence for item at {i}");
 				}
 
 				Assert.That(NHibernateUtil.IsInitialized(collection), Is.False, "Credit cards initialization status after loading again");
@@ -1140,7 +1140,7 @@ public async Task ListIndexOperationsAsync(bool initialize)
 
 				for (var i = 0; i < gavin.Companies.Count; i++)
 				{
-					Assert.That(gavin.Companies[i].OriginalIndex, Is.EqualTo(finalIndexOrder[i]), "Comparing company index at {0}", i);
+					Assert.That(gavin.Companies[i].OriginalIndex, Is.EqualTo(finalIndexOrder[i]), $"Comparing company index at {i}");
 				}
 
 				if (initialize)
@@ -1882,8 +1882,7 @@ public async Task SetClearAsync(bool initialize)
 				Assert.That(collection.Count, Is.EqualTo(6), "Permissions count after loading again Gavin");
 				for (var i = 0; i < 10; i++)
 				{
-					Assert.That(collection.Contains(addedItems[i]), i < 6 ? Is.True : (IResolveConstraint) Is.False,
-						"Checking existence of added element at {0}", i);
+					Assert.That(collection.Contains(addedItems[i]), i < 6 ? Is.True : (IResolveConstraint) Is.False, $"Checking existence of added element at {i}");
 				}
 
 				Assert.That(NHibernateUtil.IsInitialized(collection), Is.False, "Permissions initialization status after loading again");

src/NHibernate.Test/Async/Hql/Ast/BulkManipulation.cs

@@ -884,7 +884,7 @@ public async Task SimpleDeleteOnAnimalAsync()
 		{
 			if (Dialect.HasSelfReferentialForeignKeyBug)
 			{
-				Assert.Ignore("self referential FK bug", "HQL delete testing");
+				Assert.Ignore("self referential FK bug - HQL delete testing");
 				return;
 			}
 

src/NHibernate.Test/Async/IdGen/NativeGuid/NativeGuidGeneratorFixture.cs

@@ -43,7 +43,7 @@ public async Task ReturnedValueIsGuidAsync()
 			}
 			catch (NotSupportedException)
 			{
-				Assert.Ignore("This test does not apply to {0}", Dialect.Dialect.GetDialect());
+				Assert.Ignore($"This test does not apply to {Dialect.Dialect.GetDialect()}");
 			}
 
 			var gen = new NativeGuidGenerator();