Skip to content

Merge 5.3.20 into 5.4.x #3458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 29, 2023
Merged

Merge 5.3.20 into 5.4.x #3458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3031ae
Fix DB2/400 schema generation on 5.3.x (#3451)
fredericDelaporte Nov 28, 2023
6d47db4
Release 5.3.20 (#3454)
fredericDelaporte Nov 29, 2023
68acc51
Merge 5.3.20 into 5.4.x
fredericDelaporte Nov 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions releasenotes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,22 @@ Release notes - NHibernate - Version 5.4.0
* #2242 Test case for NH-3972 - SQL error when selecting a column of a subclass when sibling classes have a column of the same name


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

Expand Down
14 changes: 11 additions & 3 deletions src/NHibernate/Dialect/DB2400Dialect.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using NHibernate.Cfg;
using System;
using System.Data.Common;
using NHibernate.Dialect.Schema;
using NHibernate.SqlCommand;

namespace NHibernate.Dialect
Expand All @@ -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
Expand Down Expand Up @@ -61,4 +69,4 @@ public override bool SupportsVariableLimit
get { return false; }
}
}
}
}