mirror of
https://github.com/django/django.git
synced 2025-10-23 21:59:11 +00:00
Fixed #21127 -- Started deprecation toward requiring on_delete for ForeignKey/OneToOneField
This commit is contained in:
Flavio Curella
committed by
Tim Graham
Tim Graham
parent
87d55081ea
commit
c2e70f0265
@@ -30,9 +30,13 @@ class NamedCategory(DumbCategory):
|
||||
@python_2_unicode_compatible
|
||||
class Tag(models.Model):
|
||||
name = models.CharField(max_length=10)
|
||||
parent = models.ForeignKey('self', blank=True, null=True,
|
||||
related_name='children')
|
||||
category = models.ForeignKey(NamedCategory, null=True, default=None)
|
||||
parent = models.ForeignKey(
|
||||
'self',
|
||||
models.SET_NULL,
|
||||
blank=True, null=True,
|
||||
related_name='children',
|
||||
)
|
||||
category = models.ForeignKey(NamedCategory, models.SET_NULL, null=True, default=None)
|
||||
|
||||
class Meta:
|
||||
ordering = ['name']
|
||||
@@ -63,7 +67,7 @@ class Note(models.Model):
|
||||
@python_2_unicode_compatible
|
||||
class Annotation(models.Model):
|
||||
name = models.CharField(max_length=10)
|
||||
tag = models.ForeignKey(Tag)
|
||||
tag = models.ForeignKey(Tag, models.CASCADE)
|
||||
notes = models.ManyToManyField(Note)
|
||||
|
||||
def __str__(self):
|
||||
@@ -73,7 +77,7 @@ class Annotation(models.Model):
|
||||
@python_2_unicode_compatible
|
||||
class ExtraInfo(models.Model):
|
||||
info = models.CharField(max_length=100)
|
||||
note = models.ForeignKey(Note)
|
||||
note = models.ForeignKey(Note, models.CASCADE)
|
||||
value = models.IntegerField(null=True)
|
||||
|
||||
class Meta:
|
||||
@@ -87,7 +91,7 @@ class ExtraInfo(models.Model):
|
||||
class Author(models.Model):
|
||||
name = models.CharField(max_length=10)
|
||||
num = models.IntegerField(unique=True)
|
||||
extra = models.ForeignKey(ExtraInfo)
|
||||
extra = models.ForeignKey(ExtraInfo, models.CASCADE)
|
||||
|
||||
class Meta:
|
||||
ordering = ['name']
|
||||
@@ -102,8 +106,8 @@ class Item(models.Model):
|
||||
created = models.DateTimeField()
|
||||
modified = models.DateTimeField(blank=True, null=True)
|
||||
tags = models.ManyToManyField(Tag, blank=True)
|
||||
creator = models.ForeignKey(Author)
|
||||
note = models.ForeignKey(Note)
|
||||
creator = models.ForeignKey(Author, models.CASCADE)
|
||||
note = models.ForeignKey(Note, models.CASCADE)
|
||||
|
||||
class Meta:
|
||||
ordering = ['-note', 'name']
|
||||
@@ -115,7 +119,7 @@ class Item(models.Model):
|
||||
@python_2_unicode_compatible
|
||||
class Report(models.Model):
|
||||
name = models.CharField(max_length=10)
|
||||
creator = models.ForeignKey(Author, to_field='num', null=True)
|
||||
creator = models.ForeignKey(Author, models.SET_NULL, to_field='num', null=True)
|
||||
|
||||
def __str__(self):
|
||||
return self.name
|
||||
@@ -124,7 +128,7 @@ class Report(models.Model):
|
||||
@python_2_unicode_compatible
|
||||
class Ranking(models.Model):
|
||||
rank = models.IntegerField()
|
||||
author = models.ForeignKey(Author)
|
||||
author = models.ForeignKey(Author, models.CASCADE)
|
||||
|
||||
class Meta:
|
||||
# A complex ordering specification. Should stress the system a bit.
|
||||
@@ -137,7 +141,7 @@ class Ranking(models.Model):
|
||||
@python_2_unicode_compatible
|
||||
class Cover(models.Model):
|
||||
title = models.CharField(max_length=50)
|
||||
item = models.ForeignKey(Item)
|
||||
item = models.ForeignKey(Item, models.CASCADE)
|
||||
|
||||
class Meta:
|
||||
ordering = ['item']
|
||||
@@ -169,32 +173,32 @@ class Valid(models.Model):
|
||||
|
||||
|
||||
class X(models.Model):
|
||||
y = models.ForeignKey('Y')
|
||||
y = models.ForeignKey('Y', models.CASCADE)
|
||||
|
||||
|
||||
class Y(models.Model):
|
||||
x1 = models.ForeignKey(X, related_name='y1')
|
||||
x1 = models.ForeignKey(X, models.CASCADE, related_name='y1')
|
||||
|
||||
# Some models with a cycle in the default ordering. This would be bad if we
|
||||
# didn't catch the infinite loop.
|
||||
|
||||
|
||||
class LoopX(models.Model):
|
||||
y = models.ForeignKey('LoopY')
|
||||
y = models.ForeignKey('LoopY', models.CASCADE)
|
||||
|
||||
class Meta:
|
||||
ordering = ['y']
|
||||
|
||||
|
||||
class LoopY(models.Model):
|
||||
x = models.ForeignKey(LoopX)
|
||||
x = models.ForeignKey(LoopX, models.CASCADE)
|
||||
|
||||
class Meta:
|
||||
ordering = ['x']
|
||||
|
||||
|
||||
class LoopZ(models.Model):
|
||||
z = models.ForeignKey('self')
|
||||
z = models.ForeignKey('self', models.CASCADE)
|
||||
|
||||
class Meta:
|
||||
ordering = ['z']
|
||||
@@ -212,7 +216,7 @@ class CustomManager(models.Manager):
|
||||
@python_2_unicode_compatible
|
||||
class ManagedModel(models.Model):
|
||||
data = models.CharField(max_length=10)
|
||||
tag = models.ForeignKey(Tag)
|
||||
tag = models.ForeignKey(Tag, models.CASCADE)
|
||||
public = models.BooleanField(default=True)
|
||||
|
||||
objects = CustomManager()
|
||||
@@ -235,14 +239,14 @@ class MemberManager(models.Manager):
|
||||
|
||||
class Member(models.Model):
|
||||
name = models.CharField(max_length=10)
|
||||
details = models.OneToOneField(Detail, primary_key=True)
|
||||
details = models.OneToOneField(Detail, models.CASCADE, primary_key=True)
|
||||
|
||||
objects = MemberManager()
|
||||
|
||||
|
||||
class Child(models.Model):
|
||||
person = models.OneToOneField(Member, primary_key=True)
|
||||
parent = models.ForeignKey(Member, related_name="children")
|
||||
person = models.OneToOneField(Member, models.CASCADE, primary_key=True)
|
||||
parent = models.ForeignKey(Member, models.CASCADE, related_name="children")
|
||||
|
||||
# Custom primary keys interfered with ordering in the past.
|
||||
|
||||
@@ -256,7 +260,7 @@ class CustomPk(models.Model):
|
||||
|
||||
|
||||
class Related(models.Model):
|
||||
custom = models.ForeignKey(CustomPk)
|
||||
custom = models.ForeignKey(CustomPk, models.CASCADE)
|
||||
|
||||
|
||||
class CustomPkTag(models.Model):
|
||||
@@ -271,7 +275,7 @@ class CustomPkTag(models.Model):
|
||||
@python_2_unicode_compatible
|
||||
class Celebrity(models.Model):
|
||||
name = models.CharField("Name", max_length=20)
|
||||
greatest_fan = models.ForeignKey("Fan", null=True, unique=True)
|
||||
greatest_fan = models.ForeignKey("Fan", models.SET_NULL, null=True, unique=True)
|
||||
|
||||
def __str__(self):
|
||||
return self.name
|
||||
@@ -282,7 +286,7 @@ class TvChef(Celebrity):
|
||||
|
||||
|
||||
class Fan(models.Model):
|
||||
fan_of = models.ForeignKey(Celebrity)
|
||||
fan_of = models.ForeignKey(Celebrity, models.CASCADE)
|
||||
|
||||
# Multiple foreign keys
|
||||
|
||||
@@ -300,8 +304,8 @@ class LeafB(models.Model):
|
||||
|
||||
|
||||
class Join(models.Model):
|
||||
a = models.ForeignKey(LeafA)
|
||||
b = models.ForeignKey(LeafB)
|
||||
a = models.ForeignKey(LeafA, models.CASCADE)
|
||||
b = models.ForeignKey(LeafB, models.CASCADE)
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
@@ -324,11 +328,11 @@ class SharedConnection(models.Model):
|
||||
|
||||
|
||||
class PointerA(models.Model):
|
||||
connection = models.ForeignKey(SharedConnection)
|
||||
connection = models.ForeignKey(SharedConnection, models.CASCADE)
|
||||
|
||||
|
||||
class PointerB(models.Model):
|
||||
connection = models.ForeignKey(SharedConnection)
|
||||
connection = models.ForeignKey(SharedConnection, models.CASCADE)
|
||||
|
||||
# Multi-layer ordering
|
||||
|
||||
@@ -345,7 +349,7 @@ class SingleObject(models.Model):
|
||||
|
||||
|
||||
class RelatedObject(models.Model):
|
||||
single = models.ForeignKey(SingleObject, null=True)
|
||||
single = models.ForeignKey(SingleObject, models.SET_NULL, null=True)
|
||||
f = models.IntegerField(null=True)
|
||||
|
||||
class Meta:
|
||||
@@ -355,7 +359,7 @@ class RelatedObject(models.Model):
|
||||
@python_2_unicode_compatible
|
||||
class Plaything(models.Model):
|
||||
name = models.CharField(max_length=10)
|
||||
others = models.ForeignKey(RelatedObject, null=True)
|
||||
others = models.ForeignKey(RelatedObject, models.SET_NULL, null=True)
|
||||
|
||||
class Meta:
|
||||
ordering = ['others']
|
||||
@@ -383,7 +387,7 @@ class Food(models.Model):
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class Eaten(models.Model):
|
||||
food = models.ForeignKey(Food, to_field="name", null=True)
|
||||
food = models.ForeignKey(Food, models.SET_NULL, to_field="name", null=True)
|
||||
meal = models.CharField(max_length=20)
|
||||
|
||||
def __str__(self):
|
||||
@@ -393,7 +397,7 @@ class Eaten(models.Model):
|
||||
@python_2_unicode_compatible
|
||||
class Node(models.Model):
|
||||
num = models.IntegerField(unique=True)
|
||||
parent = models.ForeignKey("self", to_field="num", null=True)
|
||||
parent = models.ForeignKey("self", models.SET_NULL, to_field="num", null=True)
|
||||
|
||||
def __str__(self):
|
||||
return "%s" % self.num
|
||||
@@ -425,7 +429,7 @@ class ChildObjectA(ObjectA):
|
||||
@python_2_unicode_compatible
|
||||
class ObjectB(models.Model):
|
||||
name = models.CharField(max_length=50)
|
||||
objecta = models.ForeignKey(ObjectA)
|
||||
objecta = models.ForeignKey(ObjectA, models.CASCADE)
|
||||
num = models.PositiveSmallIntegerField()
|
||||
|
||||
def __str__(self):
|
||||
@@ -440,9 +444,9 @@ class ProxyObjectB(ObjectB):
|
||||
@python_2_unicode_compatible
|
||||
class ObjectC(models.Model):
|
||||
name = models.CharField(max_length=50)
|
||||
objecta = models.ForeignKey(ObjectA, null=True)
|
||||
objectb = models.ForeignKey(ObjectB, null=True)
|
||||
childobjecta = models.ForeignKey(ChildObjectA, null=True, related_name='ca_pk')
|
||||
objecta = models.ForeignKey(ObjectA, models.SET_NULL, null=True)
|
||||
objectb = models.ForeignKey(ObjectB, models.SET_NULL, null=True)
|
||||
childobjecta = models.ForeignKey(ChildObjectA, models.SET_NULL, null=True, related_name='ca_pk')
|
||||
|
||||
def __str__(self):
|
||||
return self.name
|
||||
@@ -466,7 +470,7 @@ class SpecialCategory(SimpleCategory):
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class CategoryItem(models.Model):
|
||||
category = models.ForeignKey(SimpleCategory)
|
||||
category = models.ForeignKey(SimpleCategory, models.CASCADE)
|
||||
|
||||
def __str__(self):
|
||||
return "category item: " + str(self.category)
|
||||
@@ -475,15 +479,15 @@ class CategoryItem(models.Model):
|
||||
@python_2_unicode_compatible
|
||||
class OneToOneCategory(models.Model):
|
||||
new_name = models.CharField(max_length=15)
|
||||
category = models.OneToOneField(SimpleCategory)
|
||||
category = models.OneToOneField(SimpleCategory, models.CASCADE)
|
||||
|
||||
def __str__(self):
|
||||
return "one2one " + self.new_name
|
||||
|
||||
|
||||
class CategoryRelationship(models.Model):
|
||||
first = models.ForeignKey(SimpleCategory, related_name='first_rel')
|
||||
second = models.ForeignKey(SimpleCategory, related_name='second_rel')
|
||||
first = models.ForeignKey(SimpleCategory, models.CASCADE, related_name='first_rel')
|
||||
second = models.ForeignKey(SimpleCategory, models.CASCADE, related_name='second_rel')
|
||||
|
||||
|
||||
class NullableName(models.Model):
|
||||
@@ -503,13 +507,13 @@ class ModelC(models.Model):
|
||||
|
||||
class ModelB(models.Model):
|
||||
name = models.TextField()
|
||||
c = models.ForeignKey(ModelC)
|
||||
c = models.ForeignKey(ModelC, models.CASCADE)
|
||||
|
||||
|
||||
class ModelA(models.Model):
|
||||
name = models.TextField()
|
||||
b = models.ForeignKey(ModelB, null=True)
|
||||
d = models.ForeignKey(ModelD)
|
||||
b = models.ForeignKey(ModelB, models.SET_NULL, null=True)
|
||||
d = models.ForeignKey(ModelD, models.CASCADE)
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
@@ -521,8 +525,8 @@ class Job(models.Model):
|
||||
|
||||
|
||||
class JobResponsibilities(models.Model):
|
||||
job = models.ForeignKey(Job, to_field='name')
|
||||
responsibility = models.ForeignKey('Responsibility', to_field='description')
|
||||
job = models.ForeignKey(Job, models.SET_NULL, to_field='name')
|
||||
responsibility = models.ForeignKey('Responsibility', models.SET_NULL, to_field='description')
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
@@ -553,9 +557,9 @@ class FK3(models.Model):
|
||||
|
||||
|
||||
class BaseA(models.Model):
|
||||
a = models.ForeignKey(FK1, null=True)
|
||||
b = models.ForeignKey(FK2, null=True)
|
||||
c = models.ForeignKey(FK3, null=True)
|
||||
a = models.ForeignKey(FK1, models.SET_NULL, null=True)
|
||||
b = models.ForeignKey(FK2, models.SET_NULL, null=True)
|
||||
c = models.ForeignKey(FK3, models.SET_NULL, null=True)
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
@@ -567,22 +571,22 @@ class Identifier(models.Model):
|
||||
|
||||
|
||||
class Program(models.Model):
|
||||
identifier = models.OneToOneField(Identifier)
|
||||
identifier = models.OneToOneField(Identifier, models.CASCADE)
|
||||
|
||||
|
||||
class Channel(models.Model):
|
||||
programs = models.ManyToManyField(Program)
|
||||
identifier = models.OneToOneField(Identifier)
|
||||
identifier = models.OneToOneField(Identifier, models.CASCADE)
|
||||
|
||||
|
||||
class Book(models.Model):
|
||||
title = models.TextField()
|
||||
chapter = models.ForeignKey('Chapter')
|
||||
chapter = models.ForeignKey('Chapter', models.CASCADE)
|
||||
|
||||
|
||||
class Chapter(models.Model):
|
||||
title = models.TextField()
|
||||
paragraph = models.ForeignKey('Paragraph')
|
||||
paragraph = models.ForeignKey('Paragraph', models.CASCADE)
|
||||
|
||||
|
||||
class Paragraph(models.Model):
|
||||
@@ -595,7 +599,7 @@ class Page(models.Model):
|
||||
|
||||
|
||||
class MyObject(models.Model):
|
||||
parent = models.ForeignKey('self', null=True, blank=True, related_name='children')
|
||||
parent = models.ForeignKey('self', models.SET_NULL, null=True, blank=True, related_name='children')
|
||||
data = models.CharField(max_length=100)
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
|
||||
@@ -615,7 +619,7 @@ class Order(models.Model):
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class OrderItem(models.Model):
|
||||
order = models.ForeignKey(Order, related_name='items')
|
||||
order = models.ForeignKey(Order, models.SET_NULL, related_name='items')
|
||||
status = models.IntegerField()
|
||||
|
||||
class Meta:
|
||||
@@ -632,8 +636,8 @@ class BaseUser(models.Model):
|
||||
@python_2_unicode_compatible
|
||||
class Task(models.Model):
|
||||
title = models.CharField(max_length=10)
|
||||
owner = models.ForeignKey(BaseUser, related_name='owner')
|
||||
creator = models.ForeignKey(BaseUser, related_name='creator')
|
||||
owner = models.ForeignKey(BaseUser, models.SET_NULL, related_name='owner')
|
||||
creator = models.ForeignKey(BaseUser, models.SET_NULL, related_name='creator')
|
||||
|
||||
def __str__(self):
|
||||
return self.title
|
||||
@@ -649,7 +653,7 @@ class Staff(models.Model):
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class StaffUser(BaseUser):
|
||||
staff = models.OneToOneField(Staff, related_name='user')
|
||||
staff = models.OneToOneField(Staff, models.SET_NULL, related_name='user')
|
||||
|
||||
def __str__(self):
|
||||
return self.staff
|
||||
@@ -663,7 +667,7 @@ class Ticket21203Parent(models.Model):
|
||||
|
||||
class Ticket21203Child(models.Model):
|
||||
childid = models.AutoField(primary_key=True)
|
||||
parent = models.ForeignKey(Ticket21203Parent)
|
||||
parent = models.ForeignKey(Ticket21203Parent, models.CASCADE)
|
||||
|
||||
|
||||
class Person(models.Model):
|
||||
@@ -680,8 +684,8 @@ class Company(models.Model):
|
||||
|
||||
|
||||
class Employment(models.Model):
|
||||
employer = models.ForeignKey(Company)
|
||||
employee = models.ForeignKey(Person)
|
||||
employer = models.ForeignKey(Company, models.CASCADE)
|
||||
employee = models.ForeignKey(Person, models.CASCADE)
|
||||
title = models.CharField(max_length=128)
|
||||
|
||||
|
||||
@@ -692,11 +696,11 @@ class School(models.Model):
|
||||
|
||||
|
||||
class Student(models.Model):
|
||||
school = models.ForeignKey(School)
|
||||
school = models.ForeignKey(School, models.CASCADE)
|
||||
|
||||
|
||||
class Classroom(models.Model):
|
||||
school = models.ForeignKey(School)
|
||||
school = models.ForeignKey(School, models.CASCADE)
|
||||
students = models.ManyToManyField(Student, related_name='classroom')
|
||||
|
||||
|
||||
@@ -709,8 +713,8 @@ class Ticket23605A(Ticket23605AParent):
|
||||
|
||||
|
||||
class Ticket23605B(models.Model):
|
||||
modela_fk = models.ForeignKey(Ticket23605A)
|
||||
modelc_fk = models.ForeignKey("Ticket23605C")
|
||||
modela_fk = models.ForeignKey(Ticket23605A, models.CASCADE)
|
||||
modelc_fk = models.ForeignKey("Ticket23605C", models.CASCADE)
|
||||
field_b0 = models.IntegerField(null=True)
|
||||
field_b1 = models.BooleanField(default=False)
|
||||
|
||||
@@ -728,7 +732,7 @@ class Individual(models.Model):
|
||||
|
||||
|
||||
class RelatedIndividual(models.Model):
|
||||
related = models.ForeignKey(Individual, related_name='related_individual')
|
||||
related = models.ForeignKey(Individual, models.CASCADE, related_name='related_individual')
|
||||
|
||||
class Meta:
|
||||
db_table = 'RelatedIndividual'
|
||||
|
||||
Reference in New Issue
Block a user