diff options
| author | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2025-02-12 23:05:35 +0100 |
|---|---|---|
| committer | Sarah Boyce <42296566+sarahboyce@users.noreply.github.com> | 2025-02-13 10:38:04 +0100 |
| commit | eb70aafdba18ac30e53056162c32ee6c21dea0b4 (patch) | |
| tree | b227afde9f38218bab61ad105dbeec4305cd317b /django/contrib/gis | |
| parent | d386405e04dac50656af50d100a14efdf8c58e8f (diff) | |
Reverted "Fixed #35803 -- Added support for Collect, GeoHash, and IsValid on MariaDB 11.7+."
This reverts commit c77573716a58af32ffcfc4fe87ff9e5c97909bd2.
MariaDB reverted GIS functions.
Diffstat (limited to 'django/contrib/gis')
| -rw-r--r-- | django/contrib/gis/db/backends/mysql/operations.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/django/contrib/gis/db/backends/mysql/operations.py b/django/contrib/gis/db/backends/mysql/operations.py index 5c02d5e5a7..674931b938 100644 --- a/django/contrib/gis/db/backends/mysql/operations.py +++ b/django/contrib/gis/db/backends/mysql/operations.py @@ -73,10 +73,7 @@ class MySQLOperations(BaseSpatialOperations, DatabaseOperations): models.Union, ] is_mariadb = self.connection.mysql_is_mariadb - if is_mariadb: - if self.connection.mysql_version < (11, 7): - disallowed_aggregates.insert(0, models.Collect) - elif self.connection.mysql_version < (8, 0, 24): + if is_mariadb or self.connection.mysql_version < (8, 0, 24): disallowed_aggregates.insert(0, models.Collect) return tuple(disallowed_aggregates) @@ -110,8 +107,7 @@ class MySQLOperations(BaseSpatialOperations, DatabaseOperations): } if self.connection.mysql_is_mariadb: unsupported.remove("PointOnSurface") - if self.connection.mysql_version < (11, 7): - unsupported.update({"GeoHash", "IsValid"}) + unsupported.update({"GeoHash", "IsValid"}) return unsupported def geo_db_type(self, f): |