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

Remove special-casing for proxy/unmanaged models

This commit is contained in:
Andrew Godwin 2012-09-22 01:17:08 +01:00
parent 49d1e6b0e2
commit 45e5eedea9
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -159,14 +159,11 @@ class BaseDatabaseSchemaEditor(object):
# Actions # Actions
def create_model(self, model, force=False): def create_model(self, model):
""" """
Takes a model and creates a table for it in the database. Takes a model and creates a table for it in the database.
Will also create any accompanying indexes or unique constraints. Will also create any accompanying indexes or unique constraints.
""" """
# Do nothing if this is an unmanaged or proxy model
if not force and (not model._meta.managed or model._meta.proxy):
return
# Create column SQL, add FK deferreds if needed # Create column SQL, add FK deferreds if needed
column_sqls = [] column_sqls = []
params = [] params = []
@ -226,15 +223,12 @@ class BaseDatabaseSchemaEditor(object):
self.execute(sql, params) self.execute(sql, params)
# Make M2M tables # Make M2M tables
for field in model._meta.local_many_to_many: for field in model._meta.local_many_to_many:
self.create_model(field.rel.through, force=True) self.create_model(field.rel.through)
def delete_model(self, model, force=False): def delete_model(self, model):
""" """
Deletes a model from the database. Deletes a model from the database.
""" """
# Do nothing if this is an unmanaged or proxy model
if not force and (not model._meta.managed or model._meta.proxy):
return
# Delete the table # Delete the table
self.execute(self.sql_delete_table % { self.execute(self.sql_delete_table % {
"table": self.quote_name(model._meta.db_table), "table": self.quote_name(model._meta.db_table),
@ -300,7 +294,7 @@ class BaseDatabaseSchemaEditor(object):
""" """
# Special-case implicit M2M tables # Special-case implicit M2M tables
if isinstance(field, ManyToManyField) and field.rel.through._meta.auto_created: if isinstance(field, ManyToManyField) and field.rel.through._meta.auto_created:
return self.create_model(field.rel.through, force=True) return self.create_model(field.rel.through)
# Get the column's definition # Get the column's definition
definition, params = self.column_sql(model, field, include_default=True) definition, params = self.column_sql(model, field, include_default=True)
# It might not actually have a column behind it # It might not actually have a column behind it