Commit 03bd79ed authored by Tim Graham's avatar Tim Graham
Browse files

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

parent c9178ef1

django/contrib/gis/db/backends/mysql/schema.py

+7 −0
Original line number Diff line number Diff line
@@ -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

docs/releases/1.7.2.txt

+3 −0
Original line number Diff line number Diff line
@@ -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`).