summaryrefslogtreecommitdiff
path: root/test/sql/test_query.py
diff options
context:
space:
mode:
Diffstat (limited to 'test/sql/test_query.py')
-rw-r--r--test/sql/test_query.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/test/sql/test_query.py b/test/sql/test_query.py
index ce57260b7..aa5e913d5 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(