Merge branch 'master' into contributing-breaking-changes

Author: hazzik

.config/dotnet-tools.json

@@ -9,7 +9,7 @@
       ]
     },
     "gitreleasemanager.tool": {
-      "version": "0.18.0",
+      "version": "0.20.0",
       "commands": [
         "dotnet-gitreleasemanager"
       ]

.editorconfig

@@ -27,6 +27,9 @@ dotnet_diagnostic.NUnit2031.severity = suggestion
 dotnet_diagnostic.NUnit2049.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
+dotnet_diagnostic.CA2007.severity = error
+dotnet_code_quality.CA2007.output_kind = DynamicallyLinkedLibrary
 
 [*.xsd]
 indent_style = tab

.github/workflows/GenerateAsyncCode.yml

@@ -13,13 +13,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         ref: ${{ github.event.pull_request.head.ref }}
         repository: ${{ github.event.pull_request.head.repo.full_name }}
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v4
+      uses: actions/setup-dotnet@v5
       with:
         dotnet-version: 8.0.x
 

.github/workflows/NetCoreTests.yml

@@ -16,7 +16,7 @@ jobs:
             DB_INIT: |
               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;
           - DB: SqlServer2008-MicrosoftDataSqlClientDriver
-            CONNECTION_STRING: "Server=localhost;initial catalog=nhibernate;User Id=sa;Password=P@ssw0rd;packet size=4096;"
+            CONNECTION_STRING: "Server=localhost;initial catalog=nhibernate;User Id=sa;Password=P@ssw0rd;packet size=4096;TrustServerCertificate=true;"
             OS: ubuntu-latest
             DB_INIT: |
               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;
@@ -64,12 +64,12 @@ jobs:
       run: ${{matrix.DB_INIT}}
 
     - name: Set up .NET
-      uses: actions/setup-dotnet@v4
+      uses: actions/setup-dotnet@v5
       with:
         dotnet-version: 8.0.x
 
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         show-progress: false
 

appveyor.yml

@@ -1,11 +1,12 @@
 version: '{build}'
 image: Visual Studio 2022
+skip_branch_with_pr: true
 environment:
   matrix:
   - DB: SqlServer2008
     CONNECTION_STRING: Server=(local)\SQL2017;User ID=sa;Password=Password12!;initial catalog=nhibernate;
   - DB: SqlServer2008-MicrosoftDataSqlClientDriver
-    CONNECTION_STRING: Server=(local)\SQL2017;User ID=sa;Password=Password12!;initial catalog=nhibernate;
+    CONNECTION_STRING: Server=(local)\SQL2017;User ID=sa;Password=Password12!;initial catalog=nhibernate;TrustServerCertificate=true;
   - DB: Firebird
   - DB: Firebird4
   - DB: MySQL

doc/reference/modules/configuration.xml

@@ -1606,6 +1606,11 @@ in the parameter binding.</programlisting>
                             <entry><literal>NHibernate.Dialect.SybaseASE15Dialect</literal></entry>
                             <entry></entry>
                         </row>
+                        <row>
+                            <entry>Sybase Adaptive Server Enterprise 16</entry>
+                            <entry><literal>NHibernate.Dialect.SybaseASE16Dialect</literal></entry>
+                            <entry></entry>
+                        </row>
                         <row>
                             <entry>Sybase SQL Anywhere 10</entry>
                             <entry><literal>NHibernate.Dialect.SybaseSQLAnywhere10Dialect</literal></entry>

releasenotes.txt

@@ -1,4 +1,17 @@
-Build 5.5.2
+Build 5.5.3
+=============================
+
+Release notes - NHibernate - Version 5.5.3
+
+2 issues were resolved in this release.
+
+** Task
+
+   * #3692 Release 5.5.3
+   * #3691 Merge 5.4.10 into 5.5.x
+
+
+Build 5.5.2
 =============================
 
 Release notes - NHibernate - Version 5.5.2
@@ -122,6 +135,23 @@ Release notes - NHibernate - Version 5.5.0
    * #3412 Revive hql ParsingFixture
 
 
+Build 5.4.10
+=============================
+
+Release notes - NHibernate - Version 5.4.10
+
+3 issues were resolved in this release.
+
+** Bug
+
+   * #3609 Fitering with a subquery on a many-to-one with property-ref generates invalid SQL
+   * #3607 Invalid ByCode serialization to XML for OneToOne mappings
+
+** Task
+
+   * #3688 Release 5.4.10
+
+
 Build 5.4.9
 =============================
 

src/NHibernate.Test/Ado/BatcherFixture.cs

@@ -4,9 +4,18 @@
 
 namespace NHibernate.Test.Ado
 {
-	[TestFixture]
+#if NET6_0_OR_GREATER
+	[TestFixture(true)]
+#endif
+	[TestFixture(false)]
 	public class BatcherFixture: TestCase
 	{
+		private readonly bool _useDbBatch;
+
+		public BatcherFixture(bool useDbBatch)
+		{
+			_useDbBatch = useDbBatch;
+		}
 		protected override string MappingsAssembly
 		{
 			get { return "NHibernate.Test"; }
@@ -22,10 +31,22 @@ protected override void Configure(Configuration configuration)
 			configuration.SetProperty(Environment.FormatSql, "true");
 			configuration.SetProperty(Environment.GenerateStatistics, "true");
 			configuration.SetProperty(Environment.BatchSize, "10");
+			#if NET6_0_OR_GREATER
+			if (_useDbBatch)
+			{
+				configuration.SetProperty(Environment.BatchStrategy, typeof(DbBatchBatcherFactory).AssemblyQualifiedName);
+			}
+			#endif
 		}
 
 		protected override bool AppliesTo(Engine.ISessionFactoryImplementor factory)
 		{
+#if NET6_0_OR_GREATER
+			if (_useDbBatch)
+			{
+				return factory.Settings.BatcherFactory is DbBatchBatcherFactory && factory.Settings.ConnectionProvider.Driver is Driver.DriverBase driverBase && driverBase.CanCreateBatch;
+			}
+#endif
 			return !(factory.Settings.BatcherFactory is NonBatchingBatcherFactory);
 		}
 
@@ -129,20 +150,25 @@ public void SqlClientOneRoundTripForUpdateAndInsert()
 			Cleanup();
 		}
 
-		[Test, NetFxOnly]
+		[Test]
 		[Description("SqlClient: The batcher log output should be formatted")]
 		public void BatchedoutputShouldBeFormatted()
 		{
 #if NETFX
 			if (Sfi.Settings.BatcherFactory is SqlClientBatchingBatcherFactory == false)
 				Assert.Ignore("This test is for SqlClientBatchingBatcher only");
+#elif NET6_0_OR_GREATER
+			if (Sfi.Settings.BatcherFactory is DbBatchBatcherFactory == false)
+				Assert.Ignore("This test is for DbBatchBatcherFactory only");
+#else
+			Assert.Ignore("This test is for NETFX and NET6_0_OR_GREATER only");
 #endif
 
 			using (var sqlLog = new SqlLogSpy())
 			{
 				FillDb();
 				var log = sqlLog.GetWholeLog();
-				Assert.IsTrue(log.Contains("INSERT \n    INTO"));
+				Assert.That(log, Does.Contain("INSERT \n    INTO").IgnoreCase);
 			}
 
 			Cleanup();
@@ -213,7 +239,7 @@ public void AbstractBatcherLog()
 					foreach (var loggingEvent in sl.Appender.GetEvents())
 					{
 						string message = loggingEvent.RenderedMessage;
-						if(message.ToLowerInvariant().Contains("insert"))
+						if(message.Contains("insert"))
 						{
 							Assert.That(message, Does.Contain("batch").IgnoreCase);
 						}

src/NHibernate.Test/Async/Ado/BatcherFixture.cs

@@ -16,9 +16,18 @@ namespace NHibernate.Test.Ado
 {
 	using System.Threading.Tasks;
 	using System.Threading;
-	[TestFixture]
+#if NET6_0_OR_GREATER
+	[TestFixture(true)]
+#endif
+	[TestFixture(false)]
 	public class BatcherFixtureAsync: TestCase
 	{
+		private readonly bool _useDbBatch;
+
+		public BatcherFixtureAsync(bool useDbBatch)
+		{
+			_useDbBatch = useDbBatch;
+		}
 		protected override string MappingsAssembly
 		{
 			get { return "NHibernate.Test"; }
@@ -34,10 +43,22 @@ protected override void Configure(Configuration configuration)
 			configuration.SetProperty(Environment.FormatSql, "true");
 			configuration.SetProperty(Environment.GenerateStatistics, "true");
 			configuration.SetProperty(Environment.BatchSize, "10");
+			#if NET6_0_OR_GREATER
+			if (_useDbBatch)
+			{
+				configuration.SetProperty(Environment.BatchStrategy, typeof(DbBatchBatcherFactory).AssemblyQualifiedName);
+			}
+			#endif
 		}
 
 		protected override bool AppliesTo(Engine.ISessionFactoryImplementor factory)
 		{
+#if NET6_0_OR_GREATER
+			if (_useDbBatch)
+			{
+				return factory.Settings.BatcherFactory is DbBatchBatcherFactory && factory.Settings.ConnectionProvider.Driver is Driver.DriverBase driverBase && driverBase.CanCreateBatch;
+			}
+#endif
 			return !(factory.Settings.BatcherFactory is NonBatchingBatcherFactory);
 		}
 
@@ -101,20 +122,25 @@ public async Task OneRoundTripUpdateAsync()
 			await (CleanupAsync());
 		}
 
-		[Test, NetFxOnly]
+		[Test]
 		[Description("SqlClient: The batcher log output should be formatted")]
 		public async Task BatchedoutputShouldBeFormattedAsync()
 		{
 #if NETFX
 			if (Sfi.Settings.BatcherFactory is SqlClientBatchingBatcherFactory == false)
 				Assert.Ignore("This test is for SqlClientBatchingBatcher only");
+#elif NET6_0_OR_GREATER
+			if (Sfi.Settings.BatcherFactory is DbBatchBatcherFactory == false)
+				Assert.Ignore("This test is for DbBatchBatcherFactory only");
+#else
+			Assert.Ignore("This test is for NETFX and NET6_0_OR_GREATER only");
 #endif
 
 			using (var sqlLog = new SqlLogSpy())
 			{
 				await (FillDbAsync());
 				var log = sqlLog.GetWholeLog();
-				Assert.IsTrue(log.Contains("INSERT \n    INTO"));
+				Assert.That(log, Does.Contain("INSERT \n    INTO").IgnoreCase);
 			}
 
 			await (CleanupAsync());
@@ -185,7 +211,7 @@ public async Task AbstractBatcherLogAsync()
 					foreach (var loggingEvent in sl.Appender.GetEvents())
 					{
 						string message = loggingEvent.RenderedMessage;
-						if(message.ToLowerInvariant().Contains("insert"))
+						if(message.Contains("insert"))
 						{
 							Assert.That(message, Does.Contain("batch").IgnoreCase);
 						}

src/NHibernate.Test/Async/CollectionTest/IdBagRelaxedFixture.cs

@@ -0,0 +1,72 @@
+//------------------------------------------------------------------------------
+// <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;
+using System.Collections;
+using System.Collections.Generic;
+using NUnit.Framework;
+
+namespace NHibernate.Test.CollectionTest
+{
+	using System.Threading.Tasks;
+	[TestFixture]
+	public class IdBagRelaxedFixtureAsync : TestCase
+	{
+		protected override string[] Mappings
+		{
+			get { return new string[] { "CollectionTest.IdBagRelaxedFixture.hbm.xml" }; }
+		}
+
+		protected override string MappingsAssembly
+		{
+			get { return "NHibernate.Test"; }
+		}
+
+		protected override void OnTearDown()
+		{
+			using( ISession s = OpenSession() )
+			{
+				s.Delete( "from A" );
+				s.Flush();
+			}
+		}
+
+		[Test]
+		public async Task SimpleAsync()
+		{
+			A a = new A();
+			a.Name = "first generic type";
+			a.Items = new List<string>();
+			a.Items.Add( "first string" );
+			a.Items.Add( "second string" );
+
+			ISession s = OpenSession();
+			await (s.SaveOrUpdateAsync( a ));
+			// this flush should test how NH wraps a generic collection with its
+			// own persistent collection
+			await (s.FlushAsync());
+			s.Close();
+			Assert.IsNotNull( a.Id );
+			Assert.AreEqual( "first string", ( string ) a.Items[ 0 ] );
+
+			s = OpenSession();
+			a = ( A ) await (s.LoadAsync( typeof( A ), a.Id ));
+			Assert.AreEqual( "first string", ( string ) a.Items[ 0 ], "first item should be 'first string'" );
+			Assert.AreEqual( "second string", ( string ) a.Items[ 1 ], "second item should be 'second string'" );
+			// ensuring the correct generic type was constructed
+			a.Items.Add( "third string" );
+			Assert.AreEqual( 3, a.Items.Count, "3 items in the list now" );
+
+			a.Items[ 1 ] = "new second string";
+			await (s.FlushAsync());
+			s.Close();
+		}
+	}
+}