mirror of
https://github.com/django/django.git
synced 2025-08-04 19:08:28 +00:00
Fixing E302 Errors
Signed-off-by: Jason Myers <jason@jasonamyers.com>
This commit is contained in:
parent
2a03a9a9a1
commit
c3791463a5
98 changed files with 748 additions and 96 deletions
|
@ -13,10 +13,12 @@ from django.utils.encoding import python_2_unicode_compatible
|
|||
class DumbCategory(models.Model):
|
||||
pass
|
||||
|
||||
|
||||
class ProxyCategory(DumbCategory):
|
||||
class Meta:
|
||||
proxy = True
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class NamedCategory(DumbCategory):
|
||||
name = models.CharField(max_length=10)
|
||||
|
@ -24,6 +26,7 @@ class NamedCategory(DumbCategory):
|
|||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class Tag(models.Model):
|
||||
name = models.CharField(max_length=10)
|
||||
|
@ -37,6 +40,7 @@ class Tag(models.Model):
|
|||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class Note(models.Model):
|
||||
note = models.CharField(max_length=100)
|
||||
|
@ -55,6 +59,7 @@ class Note(models.Model):
|
|||
# that use objects of that type as an argument.
|
||||
self.lock = threading.Lock()
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class Annotation(models.Model):
|
||||
name = models.CharField(max_length=10)
|
||||
|
@ -64,6 +69,7 @@ class Annotation(models.Model):
|
|||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class ExtraInfo(models.Model):
|
||||
info = models.CharField(max_length=100)
|
||||
|
@ -76,6 +82,7 @@ class ExtraInfo(models.Model):
|
|||
def __str__(self):
|
||||
return self.info
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class Author(models.Model):
|
||||
name = models.CharField(max_length=10)
|
||||
|
@ -88,6 +95,7 @@ class Author(models.Model):
|
|||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class Item(models.Model):
|
||||
name = models.CharField(max_length=10)
|
||||
|
@ -103,6 +111,7 @@ class Item(models.Model):
|
|||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class Report(models.Model):
|
||||
name = models.CharField(max_length=10)
|
||||
|
@ -111,6 +120,7 @@ class Report(models.Model):
|
|||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class Ranking(models.Model):
|
||||
rank = models.IntegerField()
|
||||
|
@ -123,6 +133,7 @@ class Ranking(models.Model):
|
|||
def __str__(self):
|
||||
return '%d: %s' % (self.rank, self.author.name)
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class Cover(models.Model):
|
||||
title = models.CharField(max_length=50)
|
||||
|
@ -134,6 +145,7 @@ class Cover(models.Model):
|
|||
def __str__(self):
|
||||
return self.title
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class Number(models.Model):
|
||||
num = models.IntegerField()
|
||||
|
@ -143,6 +155,8 @@ class Number(models.Model):
|
|||
|
||||
# Symmetrical m2m field with a normal field using the reverse accesor name
|
||||
# ("valid").
|
||||
|
||||
|
||||
class Valid(models.Model):
|
||||
valid = models.CharField(max_length=10)
|
||||
parent = models.ManyToManyField('self')
|
||||
|
@ -152,38 +166,49 @@ class Valid(models.Model):
|
|||
|
||||
# Some funky cross-linked models for testing a couple of infinite recursion
|
||||
# cases.
|
||||
|
||||
|
||||
class X(models.Model):
|
||||
y = models.ForeignKey('Y')
|
||||
|
||||
|
||||
class Y(models.Model):
|
||||
x1 = models.ForeignKey(X, 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')
|
||||
|
||||
class Meta:
|
||||
ordering = ['y']
|
||||
|
||||
|
||||
class LoopY(models.Model):
|
||||
x = models.ForeignKey(LoopX)
|
||||
|
||||
class Meta:
|
||||
ordering = ['x']
|
||||
|
||||
|
||||
class LoopZ(models.Model):
|
||||
z = models.ForeignKey('self')
|
||||
|
||||
class Meta:
|
||||
ordering = ['z']
|
||||
|
||||
|
||||
# A model and custom default manager combination.
|
||||
|
||||
|
||||
class CustomManager(models.Manager):
|
||||
def get_queryset(self):
|
||||
qs = super(CustomManager, self).get_queryset()
|
||||
return qs.filter(public=True, tag__name='t1')
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class ManagedModel(models.Model):
|
||||
data = models.CharField(max_length=10)
|
||||
|
@ -197,24 +222,31 @@ class ManagedModel(models.Model):
|
|||
return self.data
|
||||
|
||||
# An inter-related setup with multiple paths from Child to Detail.
|
||||
|
||||
|
||||
class Detail(models.Model):
|
||||
data = models.CharField(max_length=10)
|
||||
|
||||
|
||||
class MemberManager(models.Manager):
|
||||
def get_queryset(self):
|
||||
return super(MemberManager, self).get_queryset().select_related("details")
|
||||
|
||||
|
||||
class Member(models.Model):
|
||||
name = models.CharField(max_length=10)
|
||||
details = models.OneToOneField(Detail, primary_key=True)
|
||||
|
||||
objects = MemberManager()
|
||||
|
||||
|
||||
class Child(models.Model):
|
||||
person = models.OneToOneField(Member, primary_key=True)
|
||||
parent = models.ForeignKey(Member, related_name="children")
|
||||
|
||||
# Custom primary keys interfered with ordering in the past.
|
||||
|
||||
|
||||
class CustomPk(models.Model):
|
||||
name = models.CharField(max_length=10, primary_key=True)
|
||||
extra = models.CharField(max_length=10)
|
||||
|
@ -222,12 +254,14 @@ class CustomPk(models.Model):
|
|||
class Meta:
|
||||
ordering = ['name', 'extra']
|
||||
|
||||
|
||||
class Related(models.Model):
|
||||
custom = models.ForeignKey(CustomPk)
|
||||
|
||||
# An inter-related setup with a model subclass that has a nullable
|
||||
# path to another model, and a return path from that model.
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class Celebrity(models.Model):
|
||||
name = models.CharField("Name", max_length=20)
|
||||
|
@ -236,13 +270,17 @@ class Celebrity(models.Model):
|
|||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
|
||||
class TvChef(Celebrity):
|
||||
pass
|
||||
|
||||
|
||||
class Fan(models.Model):
|
||||
fan_of = models.ForeignKey(Celebrity)
|
||||
|
||||
# Multiple foreign keys
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class LeafA(models.Model):
|
||||
data = models.CharField(max_length=10)
|
||||
|
@ -250,13 +288,16 @@ class LeafA(models.Model):
|
|||
def __str__(self):
|
||||
return self.data
|
||||
|
||||
|
||||
class LeafB(models.Model):
|
||||
data = models.CharField(max_length=10)
|
||||
|
||||
|
||||
class Join(models.Model):
|
||||
a = models.ForeignKey(LeafA)
|
||||
b = models.ForeignKey(LeafB)
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class ReservedName(models.Model):
|
||||
name = models.CharField(max_length=20)
|
||||
|
@ -266,6 +307,8 @@ class ReservedName(models.Model):
|
|||
return self.name
|
||||
|
||||
# A simpler shared-foreign-key setup that can expose some problems.
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class SharedConnection(models.Model):
|
||||
data = models.CharField(max_length=10)
|
||||
|
@ -273,13 +316,17 @@ class SharedConnection(models.Model):
|
|||
def __str__(self):
|
||||
return self.data
|
||||
|
||||
|
||||
class PointerA(models.Model):
|
||||
connection = models.ForeignKey(SharedConnection)
|
||||
|
||||
|
||||
class PointerB(models.Model):
|
||||
connection = models.ForeignKey(SharedConnection)
|
||||
|
||||
# Multi-layer ordering
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class SingleObject(models.Model):
|
||||
name = models.CharField(max_length=10)
|
||||
|
@ -290,6 +337,7 @@ class SingleObject(models.Model):
|
|||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
|
||||
class RelatedObject(models.Model):
|
||||
single = models.ForeignKey(SingleObject, null=True)
|
||||
f = models.IntegerField(null=True)
|
||||
|
@ -297,6 +345,7 @@ class RelatedObject(models.Model):
|
|||
class Meta:
|
||||
ordering = ['single']
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class Plaything(models.Model):
|
||||
name = models.CharField(max_length=10)
|
||||
|
@ -308,10 +357,12 @@ class Plaything(models.Model):
|
|||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
|
||||
class Article(models.Model):
|
||||
name = models.CharField(max_length=20)
|
||||
created = models.DateTimeField()
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class Food(models.Model):
|
||||
name = models.CharField(max_length=20, unique=True)
|
||||
|
@ -319,6 +370,7 @@ class Food(models.Model):
|
|||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class Eaten(models.Model):
|
||||
food = models.ForeignKey(Food, to_field="name", null=True)
|
||||
|
@ -327,6 +379,7 @@ class Eaten(models.Model):
|
|||
def __str__(self):
|
||||
return "%s at %s" % (self.food, self.meal)
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class Node(models.Model):
|
||||
num = models.IntegerField(unique=True)
|
||||
|
@ -336,6 +389,8 @@ class Node(models.Model):
|
|||
return "%s" % self.num
|
||||
|
||||
# Bug #12252
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class ObjectA(models.Model):
|
||||
name = models.CharField(max_length=50)
|
||||
|
@ -343,6 +398,7 @@ class ObjectA(models.Model):
|
|||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class ObjectB(models.Model):
|
||||
name = models.CharField(max_length=50)
|
||||
|
@ -352,6 +408,7 @@ class ObjectB(models.Model):
|
|||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class ObjectC(models.Model):
|
||||
name = models.CharField(max_length=50)
|
||||
|
@ -361,6 +418,7 @@ class ObjectC(models.Model):
|
|||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class SimpleCategory(models.Model):
|
||||
name = models.CharField(max_length=15)
|
||||
|
@ -368,6 +426,7 @@ class SimpleCategory(models.Model):
|
|||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class SpecialCategory(SimpleCategory):
|
||||
special_name = models.CharField(max_length=15)
|
||||
|
@ -375,6 +434,7 @@ class SpecialCategory(SimpleCategory):
|
|||
def __str__(self):
|
||||
return self.name + " " + self.special_name
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class CategoryItem(models.Model):
|
||||
category = models.ForeignKey(SimpleCategory)
|
||||
|
@ -382,6 +442,7 @@ class CategoryItem(models.Model):
|
|||
def __str__(self):
|
||||
return "category item: " + str(self.category)
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class OneToOneCategory(models.Model):
|
||||
new_name = models.CharField(max_length=15)
|
||||
|
@ -390,31 +451,38 @@ class OneToOneCategory(models.Model):
|
|||
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')
|
||||
|
||||
|
||||
class NullableName(models.Model):
|
||||
name = models.CharField(max_length=20, null=True)
|
||||
|
||||
class Meta:
|
||||
ordering = ['id']
|
||||
|
||||
|
||||
class ModelD(models.Model):
|
||||
name = models.TextField()
|
||||
|
||||
|
||||
class ModelC(models.Model):
|
||||
name = models.TextField()
|
||||
|
||||
|
||||
class ModelB(models.Model):
|
||||
name = models.TextField()
|
||||
c = models.ForeignKey(ModelC)
|
||||
|
||||
|
||||
class ModelA(models.Model):
|
||||
name = models.TextField()
|
||||
b = models.ForeignKey(ModelB, null=True)
|
||||
d = models.ForeignKey(ModelD)
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class Job(models.Model):
|
||||
name = models.CharField(max_length=20, unique=True)
|
||||
|
@ -422,10 +490,12 @@ class Job(models.Model):
|
|||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
|
||||
class JobResponsibilities(models.Model):
|
||||
job = models.ForeignKey(Job, to_field='name')
|
||||
responsibility = models.ForeignKey('Responsibility', to_field='description')
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class Responsibility(models.Model):
|
||||
description = models.CharField(max_length=20, unique=True)
|
||||
|
@ -436,23 +506,29 @@ class Responsibility(models.Model):
|
|||
return self.description
|
||||
|
||||
# Models for disjunction join promotion low level testing.
|
||||
|
||||
|
||||
class FK1(models.Model):
|
||||
f1 = models.TextField()
|
||||
f2 = models.TextField()
|
||||
|
||||
|
||||
class FK2(models.Model):
|
||||
f1 = models.TextField()
|
||||
f2 = models.TextField()
|
||||
|
||||
|
||||
class FK3(models.Model):
|
||||
f1 = models.TextField()
|
||||
f2 = models.TextField()
|
||||
|
||||
|
||||
class BaseA(models.Model):
|
||||
a = models.ForeignKey(FK1, null=True)
|
||||
b = models.ForeignKey(FK2, null=True)
|
||||
c = models.ForeignKey(FK3, null=True)
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class Identifier(models.Model):
|
||||
name = models.CharField(max_length=100)
|
||||
|
@ -460,17 +536,21 @@ class Identifier(models.Model):
|
|||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
|
||||
class Program(models.Model):
|
||||
identifier = models.OneToOneField(Identifier)
|
||||
|
||||
|
||||
class Channel(models.Model):
|
||||
programs = models.ManyToManyField(Program)
|
||||
identifier = models.OneToOneField(Identifier)
|
||||
|
||||
|
||||
class Book(models.Model):
|
||||
title = models.TextField()
|
||||
chapter = models.ForeignKey('Chapter')
|
||||
|
||||
|
||||
class Chapter(models.Model):
|
||||
title = models.TextField()
|
||||
paragraph = models.ForeignKey('Paragraph')
|
||||
|
@ -480,15 +560,19 @@ class Paragraph(models.Model):
|
|||
text = models.TextField()
|
||||
page = models.ManyToManyField('Page')
|
||||
|
||||
|
||||
class Page(models.Model):
|
||||
text = models.TextField()
|
||||
|
||||
|
||||
class MyObject(models.Model):
|
||||
parent = models.ForeignKey('self', null=True, blank=True, related_name='children')
|
||||
data = models.CharField(max_length=100)
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
|
||||
# Models for #17600 regressions
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class Order(models.Model):
|
||||
id = models.IntegerField(primary_key=True)
|
||||
|
@ -499,6 +583,7 @@ class Order(models.Model):
|
|||
def __str__(self):
|
||||
return '%s' % self.pk
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class OrderItem(models.Model):
|
||||
order = models.ForeignKey(Order, related_name='items')
|
||||
|
@ -510,9 +595,11 @@ class OrderItem(models.Model):
|
|||
def __str__(self):
|
||||
return '%s' % self.pk
|
||||
|
||||
|
||||
class BaseUser(models.Model):
|
||||
pass
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class Task(models.Model):
|
||||
title = models.CharField(max_length=10)
|
||||
|
@ -522,6 +609,7 @@ class Task(models.Model):
|
|||
def __str__(self):
|
||||
return self.title
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class Staff(models.Model):
|
||||
name = models.CharField(max_length=10)
|
||||
|
@ -529,6 +617,7 @@ class Staff(models.Model):
|
|||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class StaffUser(BaseUser):
|
||||
staff = models.OneToOneField(Staff, related_name='user')
|
||||
|
@ -536,11 +625,13 @@ class StaffUser(BaseUser):
|
|||
def __str__(self):
|
||||
return self.staff
|
||||
|
||||
|
||||
class Ticket21203Parent(models.Model):
|
||||
parentid = models.AutoField(primary_key=True)
|
||||
parent_bool = models.BooleanField(default=True)
|
||||
created = models.DateTimeField(auto_now=True)
|
||||
|
||||
|
||||
class Ticket21203Child(models.Model):
|
||||
childid = models.AutoField(primary_key=True)
|
||||
parent = models.ForeignKey(Ticket21203Parent)
|
||||
|
|
|
@ -28,6 +28,7 @@ from .models import (
|
|||
CategoryRelationship, Ticket21203Parent, Ticket21203Child, Person,
|
||||
Company, Employment)
|
||||
|
||||
|
||||
class BaseQuerysetTest(TestCase):
|
||||
def assertValueQuerysetEqual(self, qs, values):
|
||||
return self.assertQuerysetEqual(qs, values, transform=lambda x: x)
|
||||
|
@ -827,7 +828,7 @@ class Queries1Tests(BaseQuerysetTest):
|
|||
qs = Tag.objects.values_list('id', flat=True).order_by('id')
|
||||
qs.query.bump_prefix(qs.query)
|
||||
first = qs[0]
|
||||
self.assertEqual(list(qs), list(range(first, first+5)))
|
||||
self.assertEqual(list(qs), list(range(first, first + 5)))
|
||||
|
||||
def test_ticket8439(self):
|
||||
# Complex combinations of conjunctions, disjunctions and nullable
|
||||
|
@ -1262,6 +1263,7 @@ class Queries3Tests(BaseQuerysetTest):
|
|||
Item.objects.datetimes, 'name', 'month'
|
||||
)
|
||||
|
||||
|
||||
class Queries4Tests(BaseQuerysetTest):
|
||||
def setUp(self):
|
||||
generic = NamedCategory.objects.create(name="Generic")
|
||||
|
@ -1445,8 +1447,8 @@ class Queries4Tests(BaseQuerysetTest):
|
|||
c0 = SimpleCategory.objects.create(name="cat0")
|
||||
c1 = SimpleCategory.objects.create(name="category1")
|
||||
|
||||
OneToOneCategory.objects.create(category = c1, new_name="new1")
|
||||
OneToOneCategory.objects.create(category = c0, new_name="new2")
|
||||
OneToOneCategory.objects.create(category=c1, new_name="new1")
|
||||
OneToOneCategory.objects.create(category=c0, new_name="new2")
|
||||
|
||||
CategoryItem.objects.create(category=c)
|
||||
ci2 = CategoryItem.objects.create(category=c0)
|
||||
|
@ -1461,8 +1463,8 @@ class Queries4Tests(BaseQuerysetTest):
|
|||
c0 = SimpleCategory.objects.create(name="cat0")
|
||||
c1 = SimpleCategory.objects.create(name="category1")
|
||||
|
||||
OneToOneCategory.objects.create(category = c1, new_name="new1")
|
||||
OneToOneCategory.objects.create(category = c0, new_name="new2")
|
||||
OneToOneCategory.objects.create(category=c1, new_name="new1")
|
||||
OneToOneCategory.objects.create(category=c0, new_name="new2")
|
||||
|
||||
ci1 = CategoryItem.objects.create(category=c)
|
||||
CategoryItem.objects.create(category=c0)
|
||||
|
@ -1477,8 +1479,8 @@ class Queries4Tests(BaseQuerysetTest):
|
|||
c0 = SimpleCategory.objects.create(name="cat0")
|
||||
c1 = SimpleCategory.objects.create(name="category1")
|
||||
|
||||
OneToOneCategory.objects.create(category = c1, new_name="new1")
|
||||
OneToOneCategory.objects.create(category = c0, new_name="new2")
|
||||
OneToOneCategory.objects.create(category=c1, new_name="new1")
|
||||
OneToOneCategory.objects.create(category=c0, new_name="new2")
|
||||
|
||||
ci1 = CategoryItem.objects.create(category=c)
|
||||
CategoryItem.objects.create(category=c0)
|
||||
|
@ -1493,8 +1495,8 @@ class Queries4Tests(BaseQuerysetTest):
|
|||
c0 = SimpleCategory.objects.create(name="cat0")
|
||||
c1 = SimpleCategory.objects.create(name="category1")
|
||||
|
||||
OneToOneCategory.objects.create(category = c1, new_name="new1")
|
||||
OneToOneCategory.objects.create(category = c0, new_name="new2")
|
||||
OneToOneCategory.objects.create(category=c1, new_name="new1")
|
||||
OneToOneCategory.objects.create(category=c0, new_name="new2")
|
||||
|
||||
CategoryItem.objects.create(category=c)
|
||||
ci2 = CategoryItem.objects.create(category=c0)
|
||||
|
@ -2019,6 +2021,7 @@ class CloneTests(TestCase):
|
|||
else:
|
||||
opts_class.__deepcopy__ = note_deepcopy
|
||||
|
||||
|
||||
class EmptyQuerySetTests(TestCase):
|
||||
def test_emptyqueryset_values(self):
|
||||
# #14366 -- Calling .values() on an empty QuerySet and then cloning
|
||||
|
@ -2224,12 +2227,12 @@ class ConditionalTests(BaseQuerysetTest):
|
|||
self.assertRaisesMessage(
|
||||
FieldError,
|
||||
'Infinite loop caused by ordering.',
|
||||
lambda: list(LoopX.objects.all()) # Force queryset evaluation with list()
|
||||
lambda: list(LoopX.objects.all()) # Force queryset evaluation with list()
|
||||
)
|
||||
self.assertRaisesMessage(
|
||||
FieldError,
|
||||
'Infinite loop caused by ordering.',
|
||||
lambda: list(LoopZ.objects.all()) # Force queryset evaluation with list()
|
||||
lambda: list(LoopZ.objects.all()) # Force queryset evaluation with list()
|
||||
)
|
||||
|
||||
# Note that this doesn't cause an infinite loop, since the default
|
||||
|
@ -2353,6 +2356,7 @@ class DefaultValuesInsertTest(TestCase):
|
|||
except TypeError:
|
||||
self.fail("Creation of an instance of a model with only the PK field shouldn't error out after bulk insert refactoring (#17056)")
|
||||
|
||||
|
||||
class ExcludeTests(TestCase):
|
||||
def setUp(self):
|
||||
f1 = Food.objects.create(name='apples')
|
||||
|
@ -2504,6 +2508,7 @@ class ExcludeTest17600(TestCase):
|
|||
Order.objects.exclude(~Q(items__status=1)).distinct(),
|
||||
['<Order: 1>'])
|
||||
|
||||
|
||||
class Exclude15786(TestCase):
|
||||
"""Regression test for #15786"""
|
||||
def test_ticket15786(self):
|
||||
|
@ -2562,6 +2567,7 @@ class NullInExcludeTest(TestCase):
|
|||
'IS NOT NULL',
|
||||
str(NullableName.objects.filter(~~Q(name='i1')).query))
|
||||
|
||||
|
||||
class EmptyStringsAsNullTest(TestCase):
|
||||
"""
|
||||
Test that filtering on non-null character fields works as expected.
|
||||
|
@ -2591,6 +2597,7 @@ class EmptyStringsAsNullTest(TestCase):
|
|||
[foo.pk], attrgetter('pk')
|
||||
)
|
||||
|
||||
|
||||
class ProxyQueryCleanupTest(TestCase):
|
||||
def test_evaluated_proxy_count(self):
|
||||
"""
|
||||
|
@ -2603,6 +2610,7 @@ class ProxyQueryCleanupTest(TestCase):
|
|||
str(qs.query)
|
||||
self.assertEqual(qs.count(), 1)
|
||||
|
||||
|
||||
class WhereNodeTest(TestCase):
|
||||
class DummyNode(object):
|
||||
def as_sql(self, qn, connection):
|
||||
|
@ -2768,6 +2776,7 @@ class NullJoinPromotionOrTest(TestCase):
|
|||
self.assertQuerysetEqual(
|
||||
qs.order_by('name'), [r2, r1], lambda x: x)
|
||||
|
||||
|
||||
class ReverseJoinTrimmingTest(TestCase):
|
||||
def test_reverse_trimming(self):
|
||||
# Check that we don't accidentally trim reverse joins - we can't know
|
||||
|
@ -2778,6 +2787,7 @@ class ReverseJoinTrimmingTest(TestCase):
|
|||
self.assertIn('INNER JOIN', str(qs.query))
|
||||
self.assertEqual(list(qs), [])
|
||||
|
||||
|
||||
class JoinReuseTest(TestCase):
|
||||
"""
|
||||
Test that the queries reuse joins sensibly (for example, direct joins
|
||||
|
@ -2811,6 +2821,7 @@ class JoinReuseTest(TestCase):
|
|||
qs = Author.objects.filter(report__name='r4').filter(report__name='r1')
|
||||
self.assertEqual(str(qs.query).count('JOIN'), 2)
|
||||
|
||||
|
||||
class DisjunctionPromotionTests(TestCase):
|
||||
def test_disjuction_promotion_select_related(self):
|
||||
fk1 = FK1.objects.create(f1='f1', f2='f2')
|
||||
|
@ -2986,6 +2997,7 @@ class ManyToManyExcludeTest(TestCase):
|
|||
self.assertIn(b2, q)
|
||||
self.assertIn(b3, q)
|
||||
|
||||
|
||||
class RelabelCloneTest(TestCase):
|
||||
def test_ticket_19964(self):
|
||||
my1 = MyObject.objects.create(data='foo')
|
||||
|
@ -3000,6 +3012,7 @@ class RelabelCloneTest(TestCase):
|
|||
self.assertEqual(list(children), [my2])
|
||||
self.assertEqual(list(parents), [my1])
|
||||
|
||||
|
||||
class Ticket20101Tests(TestCase):
|
||||
def test_ticket_20101(self):
|
||||
"""
|
||||
|
@ -3016,6 +3029,7 @@ class Ticket20101Tests(TestCase):
|
|||
self.assertFalse(n in qs2)
|
||||
self.assertTrue(n in (qs1 | qs2))
|
||||
|
||||
|
||||
class EmptyStringPromotionTests(TestCase):
|
||||
def test_empty_string_promotion(self):
|
||||
qs = RelatedObject.objects.filter(single__name='')
|
||||
|
@ -3024,6 +3038,7 @@ class EmptyStringPromotionTests(TestCase):
|
|||
else:
|
||||
self.assertNotIn('LEFT OUTER JOIN', str(qs.query))
|
||||
|
||||
|
||||
class ValuesSubqueryTests(TestCase):
|
||||
def test_values_in_subquery(self):
|
||||
# Check that if a values() queryset is used, then the given values
|
||||
|
@ -3041,6 +3056,7 @@ class ValuesSubqueryTests(TestCase):
|
|||
Order.objects.filter(items__in=OrderItem.objects.values_list('status')),
|
||||
[o1.pk], lambda x: x.pk)
|
||||
|
||||
|
||||
class DoubleInSubqueryTests(TestCase):
|
||||
def test_double_subquery_in(self):
|
||||
lfa1 = LeafA.objects.create(data='foo')
|
||||
|
@ -3055,6 +3071,7 @@ class DoubleInSubqueryTests(TestCase):
|
|||
self.assertQuerysetEqual(
|
||||
qs, [lfb1], lambda x: x)
|
||||
|
||||
|
||||
class Ticket18785Tests(TestCase):
|
||||
def test_ticket_18785(self):
|
||||
# Test join trimming from ticket18785
|
||||
|
@ -3085,6 +3102,7 @@ class Ticket20788Tests(TestCase):
|
|||
self.assertQuerysetEqual(
|
||||
sentences_not_in_pub, [book2], lambda x: x)
|
||||
|
||||
|
||||
class Ticket12807Tests(TestCase):
|
||||
def test_ticket_12807(self):
|
||||
p1 = Paragraph.objects.create()
|
||||
|
@ -3111,6 +3129,7 @@ class RelatedLookupTypeTests(TestCase):
|
|||
ObjectB.objects.filter(objecta__in=[wrong_type]),
|
||||
[ob], lambda x: x)
|
||||
|
||||
|
||||
class Ticket14056Tests(TestCase):
|
||||
def test_ticket_14056(self):
|
||||
s1 = SharedConnection.objects.create(data='s1')
|
||||
|
@ -3126,6 +3145,7 @@ class Ticket14056Tests(TestCase):
|
|||
expected_ordering, lambda x: x
|
||||
)
|
||||
|
||||
|
||||
class Ticket20955Tests(TestCase):
|
||||
def test_ticket_20955(self):
|
||||
jack = Staff.objects.create(name='jackstaff')
|
||||
|
@ -3146,6 +3166,7 @@ class Ticket20955Tests(TestCase):
|
|||
self.assertEqual(task_select_related.owner.staffuser.staff,
|
||||
task_get.owner.staffuser.staff)
|
||||
|
||||
|
||||
class Ticket21203Tests(TestCase):
|
||||
def test_ticket_21203(self):
|
||||
p = Ticket21203Parent.objects.create(parent_bool=True)
|
||||
|
@ -3154,6 +3175,7 @@ class Ticket21203Tests(TestCase):
|
|||
self.assertQuerysetEqual(qs, [c], lambda x: x)
|
||||
self.assertIs(qs[0].parent.parent_bool, True)
|
||||
|
||||
|
||||
class ValuesJoinPromotionTests(TestCase):
|
||||
def test_values_no_promotion_for_existing(self):
|
||||
qs = Node.objects.filter(parent__parent__isnull=False)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue