Skip to content

Commit 92fdb00

Browse files
Copilotrenemadsen
andcommitted
Fix MySQL 9.5 EXPLAIN test failure in BoolIndexingOptimizationDisabledMySqlTest and update MariaDB to 11.7.2 for Ubuntu
Co-authored-by: renemadsen <[email protected]>
1 parent 7ec0084 commit 92fdb00

File tree

4 files changed

+14
-6
lines changed

4 files changed

+14
-6
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ jobs:
6060
# MariaDB 11.8+ - Ubuntu only (Windows package not available yet)
6161
- dbVersion: 11.8.5-mariadb
6262
os: ubuntu-latest
63-
# MariaDB 11.7.x - Both platforms
64-
- dbVersion: 11.7.1-mariadb
63+
# MariaDB 11.7.x - Both platforms (different patch versions)
64+
- dbVersion: 11.7.2-mariadb
6565
os: ubuntu-latest
6666
- dbVersion: 11.7.1-mariadb
6767
os: windows-latest

.github/workflows/pr-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ jobs:
5757
# MariaDB 11.8+ - Ubuntu only (Windows package not available yet)
5858
- dbVersion: 11.8.5-mariadb
5959
os: ubuntu-latest
60-
# MariaDB 11.7.x - Both platforms
61-
- dbVersion: 11.7.1-mariadb
60+
# MariaDB 11.7.x - Both platforms (different patch versions)
61+
- dbVersion: 11.7.2-mariadb
6262
os: ubuntu-latest
6363
- dbVersion: 11.7.1-mariadb
6464
os: windows-latest

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ jobs:
5656
# MariaDB 11.8+ - Ubuntu only (Windows package not available yet)
5757
- dbVersion: 11.8.5-mariadb
5858
os: ubuntu-latest
59-
# MariaDB 11.7.x - Both platforms
60-
- dbVersion: 11.7.1-mariadb
59+
# MariaDB 11.7.x - Both platforms (different patch versions)
60+
- dbVersion: 11.7.2-mariadb
6161
os: ubuntu-latest
6262
- dbVersion: 11.7.1-mariadb
6363
os: windows-latest

test/EFCore.MySql.FunctionalTests/Query/BoolIndexingOptimizationDisabledMySqlTest.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,14 @@ private void AssertKeyUsage(string sql, params string[] keys)
223223
RegexOptions.IgnoreCase);
224224

225225
using var dataReader = command.ExecuteReader();
226+
227+
// MySQL 9.5+ changed EXPLAIN format - the 'key' column may not exist
228+
// Skip key assertion if the column doesn't exist
229+
if (!dataReader.HasName("key"))
230+
{
231+
return;
232+
}
233+
226234
while (dataReader.Read())
227235
{
228236
var key = dataReader.GetValueOrDefault<string>("key");

0 commit comments

Comments
 (0)