mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #35803 -- Added support for Collect, GeoHash, and IsValid on MariaDB 11.7+.

Browse Source
This commit is contained in:
Mariusz Felisiak
2024-09-27 22:26:35 +02:00
committed by Sarah Boyce
parent 0b7edb9fcd
commit c77573716a
5 changed files with 51 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
django/contrib/gis/db/backends/mysql/operations.py
View File

@@ -71,7 +71,10 @@ class MySQLOperations(BaseSpatialOperations, DatabaseOperations):
models.Union,
]
is_mariadb = self.connection.mysql_is_mariadb
if is_mariadb or self.connection.mysql_version < (8, 0, 24):
if is_mariadb:
if self.connection.mysql_version < (11, 7):
disallowed_aggregates.insert(0, models.Collect)
elif self.connection.mysql_version < (8, 0, 24):
disallowed_aggregates.insert(0, models.Collect)
return tuple(disallowed_aggregates)
@@ -105,7 +108,8 @@ class MySQLOperations(BaseSpatialOperations, DatabaseOperations):
}
if self.connection.mysql_is_mariadb:
unsupported.remove("PointOnSurface")
unsupported.update({"GeoHash", "IsValid"})
if self.connection.mysql_version < (11, 7):
unsupported.update({"GeoHash", "IsValid"})
return unsupported
def geo_db_type(self, f):