From 054db48eaf54eb9a49cf04c6c48162514f54205a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delaporte?= <12201973+fredericdelaporte@users.noreply.github.com> Date: Mon, 27 Nov 2023 21:12:39 +0100 Subject: [PATCH 1/3] Fix DB2400 metadata regression Fix the regression on 5.3.x, without adding proper support for DB2400 metadata Fix #3438 --- src/NHibernate/Dialect/DB2400Dialect.cs | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/NHibernate/Dialect/DB2400Dialect.cs b/src/NHibernate/Dialect/DB2400Dialect.cs index aa306a0d05a..91a23b1a219 100644 --- a/src/NHibernate/Dialect/DB2400Dialect.cs +++ b/src/NHibernate/Dialect/DB2400Dialect.cs @@ -1,4 +1,6 @@ -using NHibernate.Cfg; +using System; +using System.Data.Common; +using NHibernate.Dialect.Schema; using NHibernate.SqlCommand; namespace NHibernate.Dialect @@ -23,7 +25,13 @@ public class DB2400Dialect : DB2Dialect { public DB2400Dialect() { - DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.DB2400Driver"; + DefaultProperties[Cfg.Environment.ConnectionDriver] = "NHibernate.Driver.DB2400Driver"; + } + + public override IDataBaseSchema GetDataBaseSchema(DbConnection connection) + { + // The DB2 implementation is not valid for DB2400. + throw new NotSupportedException(); } public override bool SupportsSequences @@ -61,4 +69,4 @@ public override bool SupportsVariableLimit get { return false; } } } -} \ No newline at end of file +} From 99c335d853e73e4d7713e8ae61e34676022f8c1e Mon Sep 17 00:00:00 2001 From: Roman Artiukhin Date: Tue, 28 Nov 2023 07:53:45 +0200 Subject: [PATCH 2/3] Update GenerateAsyncCode.yml Try to fix async regen fail --- .github/workflows/GenerateAsyncCode.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/GenerateAsyncCode.yml b/.github/workflows/GenerateAsyncCode.yml index dd2badb26c4..964bdcf80a6 100644 --- a/.github/workflows/GenerateAsyncCode.yml +++ b/.github/workflows/GenerateAsyncCode.yml @@ -21,7 +21,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v3 with: - dotnet-version: 2.2.x + dotnet-version: 2.1.x - name: Generate Async code run: | From f9ce02ab375699d1087d76380f988a45a68c1740 Mon Sep 17 00:00:00 2001 From: Roman Artiukhin Date: Tue, 28 Nov 2023 08:20:01 +0200 Subject: [PATCH 3/3] Update GenerateAsyncCode.yml Add /p:TreatWarningsAsErrors=false to restore --- .github/workflows/GenerateAsyncCode.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/GenerateAsyncCode.yml b/.github/workflows/GenerateAsyncCode.yml index 964bdcf80a6..e505bf91508 100644 --- a/.github/workflows/GenerateAsyncCode.yml +++ b/.github/workflows/GenerateAsyncCode.yml @@ -21,13 +21,13 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v3 with: - dotnet-version: 2.1.x + dotnet-version: 2.2.x - name: Generate Async code run: | dotnet restore "./Tools/packages.csproj" --packages ./Tools pushd src - dotnet restore ./NHibernate.sln + dotnet restore ./NHibernate.sln /p:TreatWarningsAsErrors=false dotnet $(find ./../Tools/csharpasyncgenerator.commandline -name AsyncGenerator.CommandLine.dll) popd