From 2f27dd35020be46b35717cffdccaefc97b5f67dd Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 16 Feb 2020 12:01:17 -0500
Subject: [PATCH] Update test reqs for mariadb 10.4, 10.5

A few except / union tests seem to be passing on these two
versions which are now up on CI.

Change-Id: I0d65795357a6d03962d7182dda198d890a4c3f97
---
 test/requirements.py   |  6 ++++++
 test/sql/test_query.py | 10 +++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/test/requirements.py b/test/requirements.py
index 47a84fc89e..fea3b83958 100644
--- a/test/requirements.py
+++ b/test/requirements.py
@@ -1451,6 +1451,12 @@ class DefaultRequirements(SuiteRequirements):
             or config.db.dialect._mariadb_normalized_version_info < (10, 3)
         )
 
+    def _mysql_not_mariadb_104(self, config):
+        return against(config, "mysql") and (
+            not config.db.dialect._is_mariadb
+            or config.db.dialect._mariadb_normalized_version_info < (10, 4)
+        )
+
     def _has_mysql_on_windows(self, config):
         return (
             against(config, "mysql")
diff --git a/test/sql/test_query.py b/test/sql/test_query.py
index ce57260b7c..aa5e913d54 100644
--- a/test/sql/test_query.py
+++ b/test/sql/test_query.py
@@ -1208,7 +1208,9 @@ class CompoundTest(fixtures.TestBase):
         "firebird",
         "has trouble extracting anonymous column from union subquery",
     )
-    @testing.fails_on("mysql", "FIXME: unknown")
+    @testing.fails_on(
+        testing.requires._mysql_not_mariadb_104, "FIXME: unknown"
+    )
     @testing.fails_on("sqlite", "FIXME: unknown")
     def test_union_all(self):
         e = union_all(
@@ -1312,7 +1314,8 @@ class CompoundTest(fixtures.TestBase):
         eq_(found2, wanted)
 
     @testing.fails_on(
-        ["sqlite", "mysql"], "Can't handle this style of nesting"
+        ["sqlite", testing.requires._mysql_not_mariadb_104],
+        "Can't handle this style of nesting",
     )
     @testing.requires.except_
     def test_except_style3(self):
@@ -1345,7 +1348,8 @@ class CompoundTest(fixtures.TestBase):
 
     @testing.requires.intersect
     @testing.fails_on(
-        ["sqlite", "mysql"], "sqlite can't handle leading parenthesis"
+        ["sqlite", testing.requires._mysql_not_mariadb_104],
+        "sqlite can't handle leading parenthesis",
     )
     def test_intersect_unions(self):
         u = intersect(
-- 
2.47.2