diff options
| author | Tim Graham <timograham@gmail.com> | 2014-10-28 08:10:45 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-10-29 08:21:24 -0400 |
| commit | 03bd79ed2124d149114fa3b702878d75159ba2b8 (patch) | |
| tree | e6084603b80a59f7daf1aad8558a6d8d4aa325ff | |
| parent | c9178ef17a0e1070f5a25096d8e13385d404dc92 (diff) | |
Fixed #23719 -- Fixed MySQL 5.6 crash with GeometryFields in migrations.
| -rw-r--r-- | django/contrib/gis/db/backends/mysql/schema.py | 7 | ||||
| -rw-r--r-- | docs/releases/1.7.2.txt | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/django/contrib/gis/db/backends/mysql/schema.py b/django/contrib/gis/db/backends/mysql/schema.py index 3979182c19..4d708686ba 100644 --- a/django/contrib/gis/db/backends/mysql/schema.py +++ b/django/contrib/gis/db/backends/mysql/schema.py @@ -15,6 +15,13 @@ class MySQLGISSchemaEditor(DatabaseSchemaEditor): super(MySQLGISSchemaEditor, self).__init__(*args, **kwargs) self.geometry_sql = [] + def skip_default(self, field): + return ( + super(MySQLGISSchemaEditor, self).skip_default(field) or + # Geometry fields are stored as BLOB/TEXT and can't have defaults. + isinstance(field, GeometryField) + ) + def column_sql(self, model, field, include_default=False): column_sql = super(MySQLGISSchemaEditor, self).column_sql(model, field, include_default) # MySQL doesn't support spatial indexes on NULL columns diff --git a/docs/releases/1.7.2.txt b/docs/releases/1.7.2.txt index a28a86d551..80405da719 100644 --- a/docs/releases/1.7.2.txt +++ b/docs/releases/1.7.2.txt @@ -24,3 +24,6 @@ Bugfixes * Fixed a :djadmin:`makemessages` regression in 1.7.1 when :setting:`STATIC_ROOT` has the default ``None`` value (:ticket:`23717`). + +* Fixed MySQL 5.6+ crash with ``GeometryField``\s in migrations + (:ticket:`23719`). |