Commit 0c083681 authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

Fixed #9862 -- For better SQL portability, don't specify "NULL" on nullable 

columns when creating tables. Patch from Ian Kelly.

Columns are NULL by default, so we only need to use "NOT NULL" when we want
non-default behaviour.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9703 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 391736e7

django/db/backends/creation.py

+3 −3
Original line number Diff line number Diff line
@@ -47,7 +47,8 @@ class BaseDatabaseCreation(object): 
            # Make the definition (e.g. 'foo VARCHAR(30)') for this field.

            field_output = [style.SQL_FIELD(qn(f.column)),

                style.SQL_COLTYPE(col_type)]

            field_output.append(style.SQL_KEYWORD('%sNULL' % (not f.null and 'NOT ' or '')))

            if not f.null:

                field_output.append(style.SQL_KEYWORD('NOT NULL'))

            if f.primary_key:

                field_output.append(style.SQL_KEYWORD('PRIMARY KEY'))

            elif f.unique:
@@ -65,8 +66,7 @@ class BaseDatabaseCreation(object): 
            table_output.append(' '.join(field_output))

        if opts.order_with_respect_to:

            table_output.append(style.SQL_FIELD(qn('_order')) + ' ' + \

                style.SQL_COLTYPE(models.IntegerField().db_type()) + ' ' + \

                style.SQL_KEYWORD('NULL'))

                style.SQL_COLTYPE(models.IntegerField().db_type()))

        for field_constraints in opts.unique_together:

            table_output.append(style.SQL_KEYWORD('UNIQUE') + ' (%s)' % \

                ", ".join([style.SQL_FIELD(qn(opts.get_field(f).column)) for f in field_constraints]))