Merge 5.4.7 into master

Author: fredericDelaporte

appveyor.yml

@@ -63,10 +63,10 @@ before_test:
         Pop-Location
       }
       'MySQL' {
-        Start-Service 'MySQL57'
+        Start-Service 'MySQL80'
         # Create nhibernate database (not handled by NHibernate.TestDatabaseSetup.dll)
         $env:MYSQL_PWD = 'Password12!'
-        & 'C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql' -e 'CREATE DATABASE nhibernate CHARACTER SET utf8 COLLATE utf8_general_ci;' --user=root
+        & 'C:\Program Files\MySQL\MySQL Server 8.0\bin\mysql' -e 'CREATE DATABASE nhibernate CHARACTER SET utf8 COLLATE utf8_general_ci;' --user=root
       }
       'Odbc' { Start-Service 'MSSQL$SQL2017' }
       'PostgreSQL' {

releasenotes.txt

@@ -1,4 +1,18 @@
-Build 5.4.6
+Build 5.4.7
+=============================
+
+Release notes - NHibernate - Version 5.4.7
+
+3 issues were resolved in this release.
+
+** Task
+
+   * #3459 Release 5.4.7
+   * #3458 Merge 5.3.20 into 5.4.x
+   * #3453 Migrate appveyor build to MySql 8
+
+
+Build 5.4.6
 =============================
 
 Release notes - NHibernate - Version 5.4.6
@@ -311,6 +325,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
 =============================
 

src/NHibernate.Test/Async/Linq/MethodCallTests.cs

@@ -59,6 +59,7 @@ public async Task CanExecuteCountWithOrderByArgumentsAsync()
 		public async Task CanSelectPropertiesIntoObjectArrayAsync()
 		{
 			var result = await (db.Users
+				.OrderBy(u => u.Id)
 				.Select(u => new object[] {u.Id, u.Name, u.InvalidLoginAttempts})
 				.FirstAsync());
 
@@ -71,6 +72,7 @@ public async Task CanSelectPropertiesIntoObjectArrayAsync()
 		public async Task CanSelectComponentsIntoObjectArrayAsync()
 		{
 			var result = await (db.Users
+				.OrderBy(u => u.Id)
 				.Select(u => new object[] {u.Component, u.Component.OtherComponent})
 				.FirstAsync());
 
@@ -106,6 +108,7 @@ public async Task CanSelectConstantsIntoObjectArrayAsync()
 			const string name = "Julian";
 
 			var result = await (db.Users
+				.OrderBy(u => u.Id)
 				.Select(u => new object[] {u.Id, pi, name, DateTime.MinValue})
 				.FirstAsync());
 
@@ -119,6 +122,7 @@ public async Task CanSelectConstantsIntoObjectArrayAsync()
 		public async Task CanSelectPropertiesFromAssociationsIntoObjectArrayAsync()
 		{
 			var result = await (db.Users
+				.OrderBy(u => u.Id)
 				.Select(u => new object[] {u.Id, u.Role.Name, u.Role.Entity.Output})
 				.FirstAsync());
 
@@ -131,6 +135,7 @@ public async Task CanSelectPropertiesFromAssociationsIntoObjectArrayAsync()
 		public async Task CanSelectPropertiesIntoObjectArrayInPropertyAsync()
 		{
 			var result = await (db.Users
+				.OrderBy(u => u.Id)
 				.Select(u => new { Cells = new object[] { u.Id, u.Name, new object[u.Id] } })
 				.FirstAsync());
 
@@ -144,6 +149,7 @@ public async Task CanSelectPropertiesIntoObjectArrayInPropertyAsync()
 		public async Task CanSelectPropertiesIntoPropertyListInPropertyAsync()
 		{
 			var result = await (db.Users
+				.OrderBy(u => u.Id)
 				.Select(u => new { Cells = new List<object> { u.Id, u.Name, new object[u.Id] } })
 				.FirstAsync());
 
@@ -156,7 +162,7 @@ public async Task CanSelectPropertiesIntoPropertyListInPropertyAsync()
 		[Test, Description("NH-2744")]
 		public async Task CanSelectPropertiesIntoNestedObjectArraysAsync()
 		{
-			var query = db.Users.Select(u => new object[] {"Root", new object[] {"Sub1", u.Name, new object[] {"Sub2", u.Name}}});
+			var query = db.Users.OrderBy(u => u.Id).Select(u => new object[] {"Root", new object[] {"Sub1", u.Name, new object[] {"Sub2", u.Name}}});
 			var result = await (query.FirstAsync());
 
 			Assert.That(result.Length, Is.EqualTo(2));

src/NHibernate.Test/Extralazy/UserGroup.hbm.xml

@@ -4,7 +4,7 @@
 				   assembly="NHibernate.Test"
 				   namespace="NHibernate.Test.Extralazy">
 
-	<class name="Group" table="groups">
+	<class name="Group" table="`groups`">
 		<id name="Name"/>
 		<map name="Users" cascade="persist" table="group_user" lazy="extra">
 			<key column="groupName"/>

src/NHibernate.Test/Linq/MethodCallTests.cs

@@ -47,6 +47,7 @@ public void CanExecuteCountWithOrderByArguments()
 		public void CanSelectPropertiesIntoObjectArray()
 		{
 			var result = db.Users
+				.OrderBy(u => u.Id)
 				.Select(u => new object[] {u.Id, u.Name, u.InvalidLoginAttempts})
 				.First();
 
@@ -59,6 +60,7 @@ public void CanSelectPropertiesIntoObjectArray()
 		public void CanSelectComponentsIntoObjectArray()
 		{
 			var result = db.Users
+				.OrderBy(u => u.Id)
 				.Select(u => new object[] {u.Component, u.Component.OtherComponent})
 				.First();
 
@@ -94,6 +96,7 @@ public void CanSelectConstantsIntoObjectArray()
 			const string name = "Julian";
 
 			var result = db.Users
+				.OrderBy(u => u.Id)
 				.Select(u => new object[] {u.Id, pi, name, DateTime.MinValue})
 				.First();
 
@@ -107,6 +110,7 @@ public void CanSelectConstantsIntoObjectArray()
 		public void CanSelectPropertiesFromAssociationsIntoObjectArray()
 		{
 			var result = db.Users
+				.OrderBy(u => u.Id)
 				.Select(u => new object[] {u.Id, u.Role.Name, u.Role.Entity.Output})
 				.First();
 
@@ -119,6 +123,7 @@ public void CanSelectPropertiesFromAssociationsIntoObjectArray()
 		public void CanSelectPropertiesIntoObjectArrayInProperty()
 		{
 			var result = db.Users
+				.OrderBy(u => u.Id)
 				.Select(u => new { Cells = new object[] { u.Id, u.Name, new object[u.Id] } })
 				.First();
 
@@ -132,6 +137,7 @@ public void CanSelectPropertiesIntoObjectArrayInProperty()
 		public void CanSelectPropertiesIntoPropertyListInProperty()
 		{
 			var result = db.Users
+				.OrderBy(u => u.Id)
 				.Select(u => new { Cells = new List<object> { u.Id, u.Name, new object[u.Id] } })
 				.First();
 
@@ -144,7 +150,7 @@ public void CanSelectPropertiesIntoPropertyListInProperty()
 		[Test, Description("NH-2744")]
 		public void CanSelectPropertiesIntoNestedObjectArrays()
 		{
-			var query = db.Users.Select(u => new object[] {"Root", new object[] {"Sub1", u.Name, new object[] {"Sub2", u.Name}}});
+			var query = db.Users.OrderBy(u => u.Id).Select(u => new object[] {"Root", new object[] {"Sub1", u.Name, new object[] {"Sub2", u.Name}}});
 			var result = query.First();
 
 			Assert.That(result.Length, Is.EqualTo(2));

src/NHibernate.Test/NHSpecificTest/NH2113/Mappings.hbm.xml

@@ -15,7 +15,7 @@
     <property name="Name" />
 	</class>
 
-  <class name="Group" table="Groups">
+  <class name="Group" table="`Groups`">
     <id name="Id" column="GroupID">
       <generator class="increment"/>
     </id>

src/NHibernate.Test/NHSpecificTest/NH2907/Mappings.hbm.xml

@@ -12,11 +12,11 @@
 		<property name="Name" type="string"/>
 	</class>
 
-	<class name="Group" table="groups">
+	<class name="Group" table="`groups`">
 		<id name="Id">
 			<column name="GroupId"/>
 			<generator class="native"/>
 		</id>
 		<property name="Name" type="string"/>
 	</class>
-</hibernate-mapping>
+</hibernate-mapping>

src/NHibernate.Test/NHibernate.Test.csproj

@@ -73,7 +73,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="9.1.1" />
     <PackageReference Include="Npgsql" Version="7.0.4" />
-    <PackageReference Include="MySql.Data" Version="8.0.27" />
+    <PackageReference Include="MySql.Data" Version="8.0.30" />
   </ItemGroup>
   <ItemGroup Condition="$(NhNetFx)">
     <Reference Include="System.Configuration" />

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; }
 		}
 	}
-}
+}