From f3031ae6d36d2e7e755fbe5a87f10e8d3a5ea1bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delaporte?= <12201973+fredericDelaporte@users.noreply.github.com> Date: Tue, 28 Nov 2023 20:07:44 +0100 Subject: [PATCH 1/2] Fix DB2/400 schema generation on 5.3.x (#3451) Co-authored-by: Roman Artiukhin --- .github/workflows/GenerateAsyncCode.yml | 2 +- src/NHibernate/Dialect/DB2400Dialect.cs | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/GenerateAsyncCode.yml b/.github/workflows/GenerateAsyncCode.yml index dd2badb26c4..e505bf91508 100644 --- a/.github/workflows/GenerateAsyncCode.yml +++ b/.github/workflows/GenerateAsyncCode.yml @@ -27,7 +27,7 @@ jobs: 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 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 6d47db4ab4f117c40ebc8fb0d2332d30a9cfab87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delaporte?= <12201973+fredericDelaporte@users.noreply.github.com> Date: Wed, 29 Nov 2023 21:18:38 +0100 Subject: [PATCH 2/2] Release 5.3.20 (#3454) --- build-common/NHibernate.props | 2 +- releasenotes.txt | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/build-common/NHibernate.props b/build-common/NHibernate.props index 6cad2a32da7..2bc8d025dcf 100644 --- a/build-common/NHibernate.props +++ b/build-common/NHibernate.props @@ -3,7 +3,7 @@ 5.3 - 19 + 20 diff --git a/releasenotes.txt b/releasenotes.txt index c7317d2b4f6..732c2ca7df4 100644 --- a/releasenotes.txt +++ b/releasenotes.txt @@ -1,4 +1,20 @@ -Build 5.3.19 +Build 5.3.20 +============================= + +Release notes - NHibernate - Version 5.3.20 + +2 issues were resolved in this release. + +** Bug + + * #3438 DB2/400: ArgumentException Column 'SQL_TYPE_NAME' does not belong to table DataTypes + +** Task + + * #3454 Release 5.3.20 + + +Build 5.3.19 ============================= Release notes - NHibernate - Version 5.3.19