Skip to content

Commit

Permalink
Add MySQL 8.1 to integration test suite.
Browse files Browse the repository at this point in the history
  • Loading branch information
bgrainger committed Sep 4, 2023
1 parent 1f10081 commit 59bf391
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .ci/docker-run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ OMIT_FEATURES=$3
MYSQL_EXTRA=
MYSQL=mysql

if [ "$IMAGE" == "mysql:8.0" ]; then
if [[ "$IMAGE" == mysql:8.0 || "$IMAGE" == mysql:8.1 ]]; then
MYSQL_EXTRA='--default-authentication-plugin=mysql_native_password'
fi
if [[ "$IMAGE" == mariadb* ]]; then
Expand Down
8 changes: 4 additions & 4 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,6 @@ jobs:
vmimage: 'ubuntu-20.04'
strategy:
matrix:
'MySQL 5.6':
image: 'mysql:5.6'
connectionStringExtra: ''
unsupportedFeatures: 'CachingSha2Password,Ed25519,Json,LargePackets,QueryAttributes,ResetConnection,SessionTrack,Sha256Password,Tls11,Tls13,UuidToBin'
'MySQL 5.7':
image: 'mysql:5.7'
connectionStringExtra: 'Tls Cipher Suites=TLS_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256'
Expand All @@ -193,6 +189,10 @@ jobs:
image: 'mysql:8.0'
connectionStringExtra: ''
unsupportedFeatures: 'Ed25519,StreamingResults,Tls11,ZeroDateTime'
'MySQL 8.1':
image: 'mysql:8.1'
connectionStringExtra: ''
unsupportedFeatures: 'Ed25519,StreamingResults,Tls11,ZeroDateTime'
'MariaDB 10.6':
image: 'mariadb:10.6'
connectionStringExtra: ''
Expand Down
2 changes: 1 addition & 1 deletion docs/content/home.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Amazon Aurora RDS | 2.x, 3.x | Use `Pipelining=False` [for Aurora 2.x](https://m
Azure Database for MySQL | 5.7, 8.0 | Single Server and Flexible Server
Google Cloud SQL for MySQL | 5.6, 5.7, 8.0 |
MariaDB | 10.x, 11.x (**10.6**, **10.11**, **11.0**) |
MySQL | 5.5, **5.6**, **5.7**, **8.0** | 5.5 is EOL and has some [compatibility issues](https://github.com/mysql-net/MySqlConnector/issues/1192); 5.6 is EOL
MySQL | 5.5, 5.6, **5.7**, **8.0**, **8.1** | 5.5 is EOL and has some [compatibility issues](https://github.com/mysql-net/MySqlConnector/issues/1192); 5.6 is EOL
Percona Server | 5.6, 5.7, 8.0 |
PlanetScale | | See PlanetScale [MySQL compatibility notes](https://planetscale.com/docs/reference/mysql-compatibility)
ProxySQL | 2.x | Some [compatibility issues](https://github.com/search?q=repo%3Amysql-net%2FMySqlConnector+proxysql&type=issues)
Expand Down
2 changes: 1 addition & 1 deletion tests/IntegrationTests/CharacterSetTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public void CollationConnection(bool reopenConnection)
}

var collation = connection.Query<string>(@"select @@collation_connection;").Single();
var expected = connection.ServerVersion.StartsWith("8.0") ? "utf8mb4_0900_ai_ci" : "utf8mb4_general_ci";
var expected = connection.ServerVersion.StartsWith("8.", StringComparison.Ordinal) ? "utf8mb4_0900_ai_ci" : "utf8mb4_general_ci";
Assert.Equal(expected, collation);
}

Expand Down

0 comments on commit 59bf391

Please sign in to comment.