mirror of
https://github.com/django/django.git
synced 2025-08-04 02:48:35 +00:00
Fixed #21127 -- Started deprecation toward requiring on_delete for ForeignKey/OneToOneField
This commit is contained in:
parent
87d55081ea
commit
c2e70f0265
176 changed files with 1525 additions and 1008 deletions
|
@ -14,7 +14,7 @@ class Building(models.Model):
|
|||
|
||||
@python_2_unicode_compatible
|
||||
class Device(models.Model):
|
||||
building = models.ForeignKey('Building')
|
||||
building = models.ForeignKey('Building', models.CASCADE)
|
||||
name = models.CharField(max_length=10)
|
||||
|
||||
def __str__(self):
|
||||
|
@ -23,7 +23,7 @@ class Device(models.Model):
|
|||
|
||||
@python_2_unicode_compatible
|
||||
class Port(models.Model):
|
||||
device = models.ForeignKey('Device')
|
||||
device = models.ForeignKey('Device', models.CASCADE)
|
||||
port_number = models.CharField(max_length=10)
|
||||
|
||||
def __str__(self):
|
||||
|
@ -32,9 +32,18 @@ class Port(models.Model):
|
|||
|
||||
@python_2_unicode_compatible
|
||||
class Connection(models.Model):
|
||||
start = models.ForeignKey(Port, related_name='connection_start',
|
||||
unique=True)
|
||||
end = models.ForeignKey(Port, related_name='connection_end', unique=True)
|
||||
start = models.ForeignKey(
|
||||
Port,
|
||||
models.CASCADE,
|
||||
related_name='connection_start',
|
||||
unique=True,
|
||||
)
|
||||
end = models.ForeignKey(
|
||||
Port,
|
||||
models.CASCADE,
|
||||
related_name='connection_end',
|
||||
unique=True,
|
||||
)
|
||||
|
||||
def __str__(self):
|
||||
return "%s to %s" % (self.start, self.end)
|
||||
|
@ -48,24 +57,24 @@ class TUser(models.Model):
|
|||
|
||||
|
||||
class Person(models.Model):
|
||||
user = models.ForeignKey(TUser, unique=True)
|
||||
user = models.ForeignKey(TUser, models.CASCADE, unique=True)
|
||||
|
||||
|
||||
class Organizer(models.Model):
|
||||
person = models.ForeignKey(Person)
|
||||
person = models.ForeignKey(Person, models.CASCADE)
|
||||
|
||||
|
||||
class Student(models.Model):
|
||||
person = models.ForeignKey(Person)
|
||||
person = models.ForeignKey(Person, models.CASCADE)
|
||||
|
||||
|
||||
class Class(models.Model):
|
||||
org = models.ForeignKey(Organizer)
|
||||
org = models.ForeignKey(Organizer, models.CASCADE)
|
||||
|
||||
|
||||
class Enrollment(models.Model):
|
||||
std = models.ForeignKey(Student)
|
||||
cls = models.ForeignKey(Class)
|
||||
std = models.ForeignKey(Student, models.CASCADE)
|
||||
cls = models.ForeignKey(Class, models.CASCADE)
|
||||
|
||||
# Models for testing bug #8036.
|
||||
|
||||
|
@ -76,7 +85,7 @@ class Country(models.Model):
|
|||
|
||||
class State(models.Model):
|
||||
name = models.CharField(max_length=50)
|
||||
country = models.ForeignKey(Country)
|
||||
country = models.ForeignKey(Country, models.CASCADE)
|
||||
|
||||
|
||||
class ClientStatus(models.Model):
|
||||
|
@ -85,8 +94,8 @@ class ClientStatus(models.Model):
|
|||
|
||||
class Client(models.Model):
|
||||
name = models.CharField(max_length=50)
|
||||
state = models.ForeignKey(State, null=True)
|
||||
status = models.ForeignKey(ClientStatus)
|
||||
state = models.ForeignKey(State, models.SET_NULL, null=True)
|
||||
status = models.ForeignKey(ClientStatus, models.CASCADE)
|
||||
|
||||
|
||||
class SpecialClient(Client):
|
||||
|
@ -110,7 +119,7 @@ class Child(Parent):
|
|||
@python_2_unicode_compatible
|
||||
class Item(models.Model):
|
||||
name = models.CharField(max_length=10)
|
||||
child = models.ForeignKey(Child, null=True)
|
||||
child = models.ForeignKey(Child, models.SET_NULL, null=True)
|
||||
|
||||
def __str__(self):
|
||||
return self.name
|
||||
|
@ -131,7 +140,7 @@ class Hen(Fowl):
|
|||
|
||||
|
||||
class Chick(Fowl):
|
||||
mother = models.ForeignKey(Hen)
|
||||
mother = models.ForeignKey(Hen, models.CASCADE)
|
||||
|
||||
|
||||
class Base(models.Model):
|
||||
|
@ -151,6 +160,6 @@ class B(Base):
|
|||
|
||||
|
||||
class C(Base):
|
||||
c_a = models.ForeignKey(A)
|
||||
c_b = models.ForeignKey(B)
|
||||
c_a = models.ForeignKey(A, models.CASCADE)
|
||||
c_b = models.ForeignKey(B, models.CASCADE)
|
||||
is_published = models.BooleanField(default=False)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue