Skip to content

Commit 37f80d9

Browse files
Migrate appveyor build to MySql 8 (#3453)
Co-authored-by: Roman Artiukhin <bahusdrive@gmail.com>
1 parent 68acc51 commit 37f80d9

File tree

7 files changed

+21
-9
lines changed

7 files changed

+21
-9
lines changed

appveyor.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ before_test:
3939
Pop-Location
4040
}
4141
'MySQL' {
42-
Start-Service 'MySQL57'
42+
Start-Service 'MySQL80'
4343
# Create nhibernate database (not handled by NHibernate.TestDatabaseSetup.dll)
4444
$env:MYSQL_PWD = 'Password12!'
45-
& 'C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql' -e 'CREATE DATABASE nhibernate CHARACTER SET utf8 COLLATE utf8_general_ci;' --user=root
45+
& 'C:\Program Files\MySQL\MySQL Server 8.0\bin\mysql' -e 'CREATE DATABASE nhibernate CHARACTER SET utf8 COLLATE utf8_general_ci;' --user=root
4646
}
4747
'Odbc' { Start-Service 'MSSQL$SQL2017' }
4848
'PostgreSQL' {

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ public async Task CanExecuteCountWithOrderByArgumentsAsync()
5959
public async Task CanSelectPropertiesIntoObjectArrayAsync()
6060
{
6161
var result = await (db.Users
62+
.OrderBy(u => u.Id)
6263
.Select(u => new object[] {u.Id, u.Name, u.InvalidLoginAttempts})
6364
.FirstAsync());
6465

@@ -71,6 +72,7 @@ public async Task CanSelectPropertiesIntoObjectArrayAsync()
7172
public async Task CanSelectComponentsIntoObjectArrayAsync()
7273
{
7374
var result = await (db.Users
75+
.OrderBy(u => u.Id)
7476
.Select(u => new object[] {u.Component, u.Component.OtherComponent})
7577
.FirstAsync());
7678

@@ -106,6 +108,7 @@ public async Task CanSelectConstantsIntoObjectArrayAsync()
106108
const string name = "Julian";
107109

108110
var result = await (db.Users
111+
.OrderBy(u => u.Id)
109112
.Select(u => new object[] {u.Id, pi, name, DateTime.MinValue})
110113
.FirstAsync());
111114

@@ -119,6 +122,7 @@ public async Task CanSelectConstantsIntoObjectArrayAsync()
119122
public async Task CanSelectPropertiesFromAssociationsIntoObjectArrayAsync()
120123
{
121124
var result = await (db.Users
125+
.OrderBy(u => u.Id)
122126
.Select(u => new object[] {u.Id, u.Role.Name, u.Role.Entity.Output})
123127
.FirstAsync());
124128

@@ -131,6 +135,7 @@ public async Task CanSelectPropertiesFromAssociationsIntoObjectArrayAsync()
131135
public async Task CanSelectPropertiesIntoObjectArrayInPropertyAsync()
132136
{
133137
var result = await (db.Users
138+
.OrderBy(u => u.Id)
134139
.Select(u => new { Cells = new object[] { u.Id, u.Name, new object[u.Id] } })
135140
.FirstAsync());
136141

@@ -144,6 +149,7 @@ public async Task CanSelectPropertiesIntoObjectArrayInPropertyAsync()
144149
public async Task CanSelectPropertiesIntoPropertyListInPropertyAsync()
145150
{
146151
var result = await (db.Users
152+
.OrderBy(u => u.Id)
147153
.Select(u => new { Cells = new List<object> { u.Id, u.Name, new object[u.Id] } })
148154
.FirstAsync());
149155

@@ -156,7 +162,7 @@ public async Task CanSelectPropertiesIntoPropertyListInPropertyAsync()
156162
[Test, Description("NH-2744")]
157163
public async Task CanSelectPropertiesIntoNestedObjectArraysAsync()
158164
{
159-
var query = db.Users.Select(u => new object[] {"Root", new object[] {"Sub1", u.Name, new object[] {"Sub2", u.Name}}});
165+
var query = db.Users.OrderBy(u => u.Id).Select(u => new object[] {"Root", new object[] {"Sub1", u.Name, new object[] {"Sub2", u.Name}}});
160166
var result = await (query.FirstAsync());
161167

162168
Assert.That(result.Length, Is.EqualTo(2));

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
assembly="NHibernate.Test"
55
namespace="NHibernate.Test.Extralazy">
66

7-
<class name="Group" table="groups">
7+
<class name="Group" table="`groups`">
88
<id name="Name"/>
99
<map name="Users" cascade="persist" table="group_user" lazy="extra">
1010
<key column="groupName"/>

src/NHibernate.Test/Linq/MethodCallTests.cs

+7-1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ public void CanExecuteCountWithOrderByArguments()
4747
public void CanSelectPropertiesIntoObjectArray()
4848
{
4949
var result = db.Users
50+
.OrderBy(u => u.Id)
5051
.Select(u => new object[] {u.Id, u.Name, u.InvalidLoginAttempts})
5152
.First();
5253

@@ -59,6 +60,7 @@ public void CanSelectPropertiesIntoObjectArray()
5960
public void CanSelectComponentsIntoObjectArray()
6061
{
6162
var result = db.Users
63+
.OrderBy(u => u.Id)
6264
.Select(u => new object[] {u.Component, u.Component.OtherComponent})
6365
.First();
6466

@@ -94,6 +96,7 @@ public void CanSelectConstantsIntoObjectArray()
9496
const string name = "Julian";
9597

9698
var result = db.Users
99+
.OrderBy(u => u.Id)
97100
.Select(u => new object[] {u.Id, pi, name, DateTime.MinValue})
98101
.First();
99102

@@ -107,6 +110,7 @@ public void CanSelectConstantsIntoObjectArray()
107110
public void CanSelectPropertiesFromAssociationsIntoObjectArray()
108111
{
109112
var result = db.Users
113+
.OrderBy(u => u.Id)
110114
.Select(u => new object[] {u.Id, u.Role.Name, u.Role.Entity.Output})
111115
.First();
112116

@@ -119,6 +123,7 @@ public void CanSelectPropertiesFromAssociationsIntoObjectArray()
119123
public void CanSelectPropertiesIntoObjectArrayInProperty()
120124
{
121125
var result = db.Users
126+
.OrderBy(u => u.Id)
122127
.Select(u => new { Cells = new object[] { u.Id, u.Name, new object[u.Id] } })
123128
.First();
124129

@@ -132,6 +137,7 @@ public void CanSelectPropertiesIntoObjectArrayInProperty()
132137
public void CanSelectPropertiesIntoPropertyListInProperty()
133138
{
134139
var result = db.Users
140+
.OrderBy(u => u.Id)
135141
.Select(u => new { Cells = new List<object> { u.Id, u.Name, new object[u.Id] } })
136142
.First();
137143

@@ -144,7 +150,7 @@ public void CanSelectPropertiesIntoPropertyListInProperty()
144150
[Test, Description("NH-2744")]
145151
public void CanSelectPropertiesIntoNestedObjectArrays()
146152
{
147-
var query = db.Users.Select(u => new object[] {"Root", new object[] {"Sub1", u.Name, new object[] {"Sub2", u.Name}}});
153+
var query = db.Users.OrderBy(u => u.Id).Select(u => new object[] {"Root", new object[] {"Sub1", u.Name, new object[] {"Sub2", u.Name}}});
148154
var result = query.First();
149155

150156
Assert.That(result.Length, Is.EqualTo(2));

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<property name="Name" />
1616
</class>
1717

18-
<class name="Group" table="Groups">
18+
<class name="Group" table="`Groups`">
1919
<id name="Id" column="GroupID">
2020
<generator class="increment"/>
2121
</id>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
<property name="Name" type="string"/>
1313
</class>
1414

15-
<class name="Group" table="groups">
15+
<class name="Group" table="`groups`">
1616
<id name="Id">
1717
<column name="GroupId"/>
1818
<generator class="native"/>
1919
</id>
2020
<property name="Name" type="string"/>
2121
</class>
22-
</hibernate-mapping>
22+
</hibernate-mapping>

src/NHibernate.Test/NHibernate.Test.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
6868
<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="8.5.2" />
6969
<PackageReference Include="Npgsql" Version="6.0.6" />
70-
<PackageReference Include="MySql.Data" Version="8.0.27" />
70+
<PackageReference Include="MySql.Data" Version="8.0.30" />
7171
</ItemGroup>
7272
<ItemGroup Condition="$(NhNetFx)">
7373
<Reference Include="System.Configuration" />

0 commit comments

Comments
 (0)