Skip to content

Commit

Permalink
Merge pull request #3832 from atombrella/warnings_20_fkeys
Browse files Browse the repository at this point in the history
Regarding #3729
  • Loading branch information
xordoquy committed Jan 14, 2016
2 parents 29f84aa + 215e1b6 commit b76bf3d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
3 changes: 2 additions & 1 deletion rest_framework/authtoken/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ class Token(models.Model):
The default authorization token model.
"""
key = models.CharField(max_length=40, primary_key=True)
user = models.OneToOneField(AUTH_USER_MODEL, related_name='auth_token')
user = models.OneToOneField(AUTH_USER_MODEL, related_name='auth_token',
on_delete=models.CASCADE)
created = models.DateTimeField(auto_now_add=True)

def save(self, *args, **kwargs):
Expand Down
8 changes: 5 additions & 3 deletions tests/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,17 @@ class ForeignKeyTarget(RESTFrameworkModel):
class ForeignKeySource(RESTFrameworkModel):
name = models.CharField(max_length=100)
target = models.ForeignKey(ForeignKeyTarget, related_name='sources',
help_text='Target', verbose_name='Target')
help_text='Target', verbose_name='Target',
on_delete=models.CASCADE)


# Nullable ForeignKey
class NullableForeignKeySource(RESTFrameworkModel):
name = models.CharField(max_length=100)
target = models.ForeignKey(ForeignKeyTarget, null=True, blank=True,
related_name='nullable_sources',
verbose_name='Optional target object')
verbose_name='Optional target object',
on_delete=models.CASCADE)


# OneToOne
Expand All @@ -68,4 +70,4 @@ class OneToOneTarget(RESTFrameworkModel):
class NullableOneToOneSource(RESTFrameworkModel):
name = models.CharField(max_length=100)
target = models.OneToOneField(OneToOneTarget, null=True, blank=True,
related_name='nullable_source')
related_name='nullable_source', on_delete=models.CASCADE)

0 comments on commit b76bf3d

Please sign in to comment.