From 1351fa138673d93c81c5c44f28711a684c9da8b5 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Thu, 30 Aug 2018 17:12:58 -0400 Subject: MariaDB 10.3 updates MariaDB seems to handle some additional UPDATE/DELETE FROM syntaxes as well as some forms of INTERSECT and EXCEPT. Open up tests that expect failure for MySQL to allow success for MariaDB 10.3. Change-Id: Ia9341a82485ef7201bb8130d8dbf4a9b6976035a (cherry picked from commit 081d4275cf5c3e6842c8e0198542ff89617eaa96) --- test/sql/test_query.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'test/sql') diff --git a/test/sql/test_query.py b/test/sql/test_query.py index bc9a176f1..06c90044d 100644 --- a/test/sql/test_query.py +++ b/test/sql/test_query.py @@ -846,7 +846,8 @@ class CompoundTest(fixtures.TestBase): found2 = self._fetchall_sorted(e.alias().select().execute()) eq_(found2, wanted) - @testing.fails_on('sqlite', "Can't handle this style of nesting") + @testing.fails_on( + ['sqlite', 'mysql'], "Can't handle this style of nesting") @testing.requires.except_ def test_except_style3(self): # aaa, bbb, ccc - (aaa, bbb, ccc - (ccc)) = ccc @@ -878,7 +879,8 @@ class CompoundTest(fixtures.TestBase): ) @testing.requires.intersect - @testing.fails_on('sqlite', "sqlite can't handle leading parenthesis") + @testing.fails_on(['sqlite', 'mysql'], + "sqlite can't handle leading parenthesis") def test_intersect_unions(self): u = intersect( union( -- cgit v1.2.1