innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fix location of tablespace clauses in schema backend column SQL

This commit is contained in:
Andrew Godwin 2013-08-23 14:38:55 +01:00
parent 8363406dad
commit 2787de652a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
django/db/backends/schema.py
View File

@ -107,10 +107,6 @@ class BaseDatabaseSchemaEditor(object):
# Check for fields that aren't actually columns (e.g. M2M)
if sql is None:
return None
# Optionally add the tablespace if it's an implicitly indexed column
tablespace = field.db_tablespace or model._meta.db_tablespace
if tablespace and self.connection.features.supports_tablespaces and field.unique:
sql += " %s" % self.connection.ops.tablespace_sql(tablespace, inline=True)
# Work out nullability
null = field.null
# If we were told to include a default value, do so
@ -138,6 +134,10 @@ class BaseDatabaseSchemaEditor(object):
sql += " PRIMARY KEY"
elif field.unique:
sql += " UNIQUE"
# Optionally add the tablespace if it's an implicitly indexed column
tablespace = field.db_tablespace or model._meta.db_tablespace
if tablespace and self.connection.features.supports_tablespaces and field.unique:
sql += " %s" % self.connection.ops.tablespace_sql(tablespace, inline=True)
# Return the sql
return sql, params