Skip to content

Commit ef4f4a4

Browse files
authored
Upgrade MySql client and remove allowed failures on CI builds (#2501)
* Register missing keywords for MySQLDialect
1 parent d6e054f commit ef4f4a4

File tree

4 files changed

+13
-16
lines changed

4 files changed

+13
-16
lines changed

.travis.yml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
dist: trusty
1+
os: linux
2+
dist: xenial
23
language: csharp
34
mono: none
45
dotnet: 2.1.300
5-
sudo: required
66
services:
77
- mysql
88
- postgresql
@@ -13,25 +13,22 @@ env:
1313
- DB=Firebird
1414
- DB=MySQL CONNECTION_STRING="Server=127.0.0.1;Uid=root;Database=nhibernate;Old Guids=True;"
1515
- DB=SQLite
16-
matrix:
17-
allow_failures:
18-
- env: DB=MySQL CONNECTION_STRING="Server=127.0.0.1;Uid=root;Database=nhibernate;Old Guids=True;"
1916
before_install:
20-
- curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
21-
- curl https://packages.microsoft.com/config/ubuntu/14.04/prod.list | sudo tee /etc/apt/sources.list.d/microsoft.list
2217
- sudo apt-get update -qq
2318
- sudo apt-get install -y powershell
2419
- |-
2520
if [[ "$DB" == "MySQL" ]]
2621
then
27-
echo -e '[server]\nlower_case_table_names=1' | sudo tee -a /etc/mysql/my.cnf
22+
echo -e '[server]\nlower_case_table_names=1\n[mysqld]\ncharacter-set-server=utf8\ncollation-server=utf8_general_ci' | sudo tee -a /etc/mysql/my.cnf
2823
sudo service mysql restart
2924
fi
3025
- |-
3126
if [[ "$DB" == "Firebird" ]]
3227
then
33-
sudo apt-get install -y libicu-dev libtommath-dev curl
34-
curl -L -O https://github.com/FirebirdSQL/firebird/releases/download/R3_0_5/Firebird-3.0.5.33220-0.amd64.tar.gz
28+
sudo apt-get install -y libtommath-dev
29+
# This would be required on bionic and above
30+
# sudo ln -s /usr/lib/x86_64-linux-gnu/libtommath.so.1 /usr/lib/x86_64-linux-gnu/libtommath.so.0
31+
wget -q https://github.com/FirebirdSQL/firebird/releases/download/R3_0_5/Firebird-3.0.5.33220-0.amd64.tar.gz
3532
tar xzvf Firebird-3.0.5.33220-0.amd64.tar.gz
3633
pushd Firebird-3.0.5.33220-0.amd64
3734
sudo ./install.sh -silent
@@ -41,7 +38,7 @@ before_install:
4138
echo -e "nhibernate = /tmp/firebird/nhibernate.fdb" | sudo tee -a /opt/firebird/databases.conf
4239
echo -e "AuthServer = Srp\nAuthClient = Srp\nUserManager = Srp\nWireCrypt = Enabled" | sudo tee -a /opt/firebird/firebird.conf
4340
sudo /opt/firebird/bin/gsec -modify SYSDBA -pw masterkey -admin yes
44-
sudo service firebird restart
41+
sudo systemctl restart firebird-superserver
4542
fi
4643
before_script:
4744
- if [[ "$DB" == "SqlServer2008" ]]; then docker run -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=P@ssw0rd" -e "MSSQL_PID=Express" -p 1433:1433 -d --name sqlexpress microsoft/mssql-server-linux:latest; fi

appveyor.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ environment:
1313
init:
1414
# Required for having windows endlines in sources zip
1515
- git config --global core.autocrlf true
16-
matrix:
17-
allow_failures:
18-
- DB: MySQL
1916
build: off
2017
before_test:
2118
- ps: |-

src/NHibernate.Test/NHibernate.Test.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
6666
<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="6.3.0" />
6767
<PackageReference Include="Npgsql" Version="4.0.3" />
68+
<PackageReference Include="MySql.Data" Version="8.0.22" />
6869
</ItemGroup>
6970
<ItemGroup Condition="$(NhNetFx)">
7071
<Reference Include="System.Configuration" />
@@ -74,7 +75,6 @@
7475
<Reference Include="System.Data.OracleClient" />
7576
<PackageReference Include="Microsoft.SqlServer.Compact" Version="4.0.8876.1" />
7677
<PackageReference Include="Oracle.ManagedDataAccess" Version="12.1.2400" />
77-
<PackageReference Include="MySql.Data" Version="6.9.11" />
7878
</ItemGroup>
7979
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.0'">
8080
<PackageReference Include="System.CodeDom" Version="4.4.0" />
@@ -83,7 +83,6 @@
8383
<PackageReference Include="System.Data.Odbc" Version="4.5.0" />
8484
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
8585
<PackageReference Include="NUnitLite" Version="3.12.0" />
86-
<PackageReference Include="MySql.Data" Version="6.10.6" />
8786
</ItemGroup>
8887
<ItemGroup Condition=" '$(NuGetPackageRoot)' != '' ">
8988
<NativeBinaries Include="$(NuGetPackageRoot)microsoft.sqlserver.compact\4.0.8876.1\NativeBinaries\**\*.*" />

src/NHibernate/Dialect/MySQLDialect.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ public MySQLDialect()
155155
"float8",
156156
"force",
157157
"fulltext",
158+
"goto",
158159
"high_priority",
159160
"hour_microsecond",
160161
"hour_minute",
@@ -170,6 +171,7 @@ public MySQLDialect()
170171
"key",
171172
"keys",
172173
"kill",
174+
"label",
173175
"limit",
174176
"linear",
175177
"lines",
@@ -179,6 +181,7 @@ public MySQLDialect()
179181
"longblob",
180182
"longtext",
181183
"low_priority",
184+
"master_ssl_verify_server_cert",
182185
"mediumblob",
183186
"mediumint",
184187
"mediumtext",
@@ -207,6 +210,7 @@ public MySQLDialect()
207210
"second_microsecond",
208211
"separator",
209212
"show",
213+
"shutdown",
210214
"spatial",
211215
"sql_big_result",
212216
"sql_calc_found_rows",

0 commit comments

Comments
 (0)