From 20b6e308585d9690de387cd5a2c2e95c6d28ae53 Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Fri, 24 Jun 2022 08:30:26 +0200 Subject: [PATCH] Refs #33713 -- Removed unnecessary skip for MariaDB 10.3. --- django/db/backends/mysql/features.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/django/db/backends/mysql/features.py b/django/db/backends/mysql/features.py index 47e3ad0479..b454618646 100644 --- a/django/db/backends/mysql/features.py +++ b/django/db/backends/mysql/features.py @@ -175,16 +175,12 @@ class DatabaseFeatures(BaseDatabaseFeatures): }, } ) - if ( - self.connection.mysql_is_mariadb and self.connection.mysql_version < (10, 4) - ) or ( - not self.connection.mysql_is_mariadb - and self.connection.mysql_version < (8,) + if not self.connection.mysql_is_mariadb and self.connection.mysql_version < ( + 8, ): skips.update( { - "Parenthesized combined queries are not supported on MySQL < 8 and " - "MariaDB < 10.4": { + "Parenthesized combined queries are not supported on MySQL < 8.": { "queries.test_qs_combinators.QuerySetSetOperationTests." "test_union_in_subquery", "queries.test_qs_combinators.QuerySetSetOperationTests."