Skip to content

Commit 68acc51

Browse files
Merge 5.3.20 into 5.4.x
2 parents ccff784 + 6d47db4 commit 68acc51

File tree

2 files changed

+27
-3
lines changed

2 files changed

+27
-3
lines changed

releasenotes.txt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,22 @@ Release notes - NHibernate - Version 5.4.0
311311
* #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
312312

313313

314+
Build 5.3.20
315+
=============================
316+
317+
Release notes - NHibernate - Version 5.3.20
318+
319+
2 issues were resolved in this release.
320+
321+
** Bug
322+
323+
* #3438 DB2/400: ArgumentException Column 'SQL_TYPE_NAME' does not belong to table DataTypes
324+
325+
** Task
326+
327+
* #3454 Release 5.3.20
328+
329+
314330
Build 5.3.19
315331
=============================
316332

src/NHibernate/Dialect/DB2400Dialect.cs

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
using NHibernate.Cfg;
1+
using System;
2+
using System.Data.Common;
3+
using NHibernate.Dialect.Schema;
24
using NHibernate.SqlCommand;
35

46
namespace NHibernate.Dialect
@@ -23,7 +25,13 @@ public class DB2400Dialect : DB2Dialect
2325
{
2426
public DB2400Dialect()
2527
{
26-
DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.DB2400Driver";
28+
DefaultProperties[Cfg.Environment.ConnectionDriver] = "NHibernate.Driver.DB2400Driver";
29+
}
30+
31+
public override IDataBaseSchema GetDataBaseSchema(DbConnection connection)
32+
{
33+
// The DB2 implementation is not valid for DB2400.
34+
throw new NotSupportedException();
2735
}
2836

2937
public override bool SupportsSequences
@@ -61,4 +69,4 @@ public override bool SupportsVariableLimit
6169
get { return false; }
6270
}
6371
}
64-
}
72+
}

0 commit comments

Comments
 (0)