p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #23719 -- Fixed MySQL 5.6 crash with GeometryFields in migrations.

This commit is contained in:
Tim Graham 2014-10-28 08:10:45 -04:00
parent c9178ef17a
commit 03bd79ed21
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/contrib/gis/db/backends/mysql/schema.py
View File

@ -15,6 +15,13 @@ class MySQLGISSchemaEditor(DatabaseSchemaEditor):
super(MySQLGISSchemaEditor, self).__init__(*args, **kwargs) super(MySQLGISSchemaEditor, self).__init__(*args, **kwargs)
self.geometry_sql = [] 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): def column_sql(self, model, field, include_default=False):
column_sql = super(MySQLGISSchemaEditor, self).column_sql(model, field, include_default) column_sql = super(MySQLGISSchemaEditor, self).column_sql(model, field, include_default)
# MySQL doesn't support spatial indexes on NULL columns # MySQL doesn't support spatial indexes on NULL columns

3
docs/releases/1.7.2.txt
View File

@ -24,3 +24,6 @@ Bugfixes
* Fixed a :djadmin:`makemessages` regression in 1.7.1 when * Fixed a :djadmin:`makemessages` regression in 1.7.1 when
:setting:`STATIC_ROOT` has the default ``None`` value (:ticket:`23717`). :setting:`STATIC_ROOT` has the default ``None`` value (:ticket:`23717`).
* Fixed MySQL 5.6+ crash with ``GeometryField``\s in migrations
(:ticket:`23719`).