mirror of
https://github.com/django/django.git
synced 2024-12-25 02:26:12 +00:00
d3f00bd570
The sql/query.py add_q method did a lot of where/having tree hacking to get complex queries to work correctly. The logic was refactored so that it should be simpler to understand. The new logic should also produce leaner WHERE conditions. The changes cascade somewhat, as some other parts of Django (like add_filter() and WhereNode) expect boolean trees in certain format or they fail to work. So to fix the add_q() one must fix utils/tree.py, some things in add_filter(), WhereNode and so on. This commit also fixed add_filter to see negate clauses up the path. A query like .exclude(Q(reversefk__in=a_list)) didn't work similarly to .filter(~Q(reversefk__in=a_list)). The reason for this is that only the immediate parent negate clauses were seen by add_filter, and thus a tree like AND: (NOT AND: (AND: condition)) will not be handled correctly, as there is one intermediary AND node in the tree. The example tree is generated by .exclude(~Q(reversefk__in=a_list)). Still, aggregation lost connectors in OR cases, and F() objects and aggregates in same filter clause caused GROUP BY problems on some databases. Fixed #17600, fixed #13198, fixed #17025, fixed #17000, fixed #11293.
500 lines
13 KiB
Python
500 lines
13 KiB
Python
"""
|
|
Various complex queries that have been problematic in the past.
|
|
"""
|
|
from __future__ import unicode_literals
|
|
|
|
import threading
|
|
|
|
from django.db import models
|
|
from django.utils import six
|
|
from django.utils.encoding import python_2_unicode_compatible
|
|
|
|
|
|
class DumbCategory(models.Model):
|
|
pass
|
|
|
|
class ProxyCategory(DumbCategory):
|
|
class Meta:
|
|
proxy = True
|
|
|
|
class NamedCategory(DumbCategory):
|
|
name = models.CharField(max_length=10)
|
|
|
|
@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)
|
|
|
|
class Meta:
|
|
ordering = ['name']
|
|
|
|
def __str__(self):
|
|
return self.name
|
|
|
|
@python_2_unicode_compatible
|
|
class Note(models.Model):
|
|
note = models.CharField(max_length=100)
|
|
misc = models.CharField(max_length=10)
|
|
|
|
class Meta:
|
|
ordering = ['note']
|
|
|
|
def __str__(self):
|
|
return self.note
|
|
|
|
def __init__(self, *args, **kwargs):
|
|
super(Note, self).__init__(*args, **kwargs)
|
|
# Regression for #13227 -- having an attribute that
|
|
# is unpickleable doesn't stop you from cloning queries
|
|
# 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)
|
|
tag = models.ForeignKey(Tag)
|
|
notes = models.ManyToManyField(Note)
|
|
|
|
def __str__(self):
|
|
return self.name
|
|
|
|
@python_2_unicode_compatible
|
|
class ExtraInfo(models.Model):
|
|
info = models.CharField(max_length=100)
|
|
note = models.ForeignKey(Note)
|
|
value = models.IntegerField(null=True)
|
|
|
|
class Meta:
|
|
ordering = ['info']
|
|
|
|
def __str__(self):
|
|
return self.info
|
|
|
|
@python_2_unicode_compatible
|
|
class Author(models.Model):
|
|
name = models.CharField(max_length=10)
|
|
num = models.IntegerField(unique=True)
|
|
extra = models.ForeignKey(ExtraInfo)
|
|
|
|
class Meta:
|
|
ordering = ['name']
|
|
|
|
def __str__(self):
|
|
return self.name
|
|
|
|
@python_2_unicode_compatible
|
|
class Item(models.Model):
|
|
name = models.CharField(max_length=10)
|
|
created = models.DateTimeField()
|
|
modified = models.DateTimeField(blank=True, null=True)
|
|
tags = models.ManyToManyField(Tag, blank=True, null=True)
|
|
creator = models.ForeignKey(Author)
|
|
note = models.ForeignKey(Note)
|
|
|
|
class Meta:
|
|
ordering = ['-note', 'name']
|
|
|
|
def __str__(self):
|
|
return self.name
|
|
|
|
@python_2_unicode_compatible
|
|
class Report(models.Model):
|
|
name = models.CharField(max_length=10)
|
|
creator = models.ForeignKey(Author, to_field='num', null=True)
|
|
|
|
def __str__(self):
|
|
return self.name
|
|
|
|
@python_2_unicode_compatible
|
|
class Ranking(models.Model):
|
|
rank = models.IntegerField()
|
|
author = models.ForeignKey(Author)
|
|
|
|
class Meta:
|
|
# A complex ordering specification. Should stress the system a bit.
|
|
ordering = ('author__extra__note', 'author__name', 'rank')
|
|
|
|
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)
|
|
item = models.ForeignKey(Item)
|
|
|
|
class Meta:
|
|
ordering = ['item']
|
|
|
|
def __str__(self):
|
|
return self.title
|
|
|
|
@python_2_unicode_compatible
|
|
class Number(models.Model):
|
|
num = models.IntegerField()
|
|
|
|
def __str__(self):
|
|
return six.text_type(self.num)
|
|
|
|
# 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')
|
|
|
|
class Meta:
|
|
ordering = ['valid']
|
|
|
|
# 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)
|
|
tag = models.ForeignKey(Tag)
|
|
public = models.BooleanField(default=True)
|
|
|
|
objects = CustomManager()
|
|
normal_manager = models.Manager()
|
|
|
|
def __str__(self):
|
|
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)
|
|
|
|
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)
|
|
greatest_fan = models.ForeignKey("Fan", null=True, unique=True)
|
|
|
|
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)
|
|
|
|
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)
|
|
order = models.IntegerField()
|
|
|
|
def __str__(self):
|
|
return self.name
|
|
|
|
# A simpler shared-foreign-key setup that can expose some problems.
|
|
class SharedConnection(models.Model):
|
|
data = models.CharField(max_length=10)
|
|
|
|
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)
|
|
|
|
class Meta:
|
|
ordering = ['name']
|
|
|
|
def __str__(self):
|
|
return self.name
|
|
|
|
class RelatedObject(models.Model):
|
|
single = models.ForeignKey(SingleObject, null=True)
|
|
f = models.IntegerField(null=True)
|
|
|
|
class Meta:
|
|
ordering = ['single']
|
|
|
|
@python_2_unicode_compatible
|
|
class Plaything(models.Model):
|
|
name = models.CharField(max_length=10)
|
|
others = models.ForeignKey(RelatedObject, null=True)
|
|
|
|
class Meta:
|
|
ordering = ['others']
|
|
|
|
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)
|
|
|
|
def __str__(self):
|
|
return self.name
|
|
|
|
@python_2_unicode_compatible
|
|
class Eaten(models.Model):
|
|
food = models.ForeignKey(Food, to_field="name", null=True)
|
|
meal = models.CharField(max_length=20)
|
|
|
|
def __str__(self):
|
|
return "%s at %s" % (self.food, self.meal)
|
|
|
|
@python_2_unicode_compatible
|
|
class Node(models.Model):
|
|
num = models.IntegerField(unique=True)
|
|
parent = models.ForeignKey("self", to_field="num", null=True)
|
|
|
|
def __str__(self):
|
|
return "%s" % self.num
|
|
|
|
# Bug #12252
|
|
@python_2_unicode_compatible
|
|
class ObjectA(models.Model):
|
|
name = models.CharField(max_length=50)
|
|
|
|
def __str__(self):
|
|
return self.name
|
|
|
|
@python_2_unicode_compatible
|
|
class ObjectB(models.Model):
|
|
name = models.CharField(max_length=50)
|
|
objecta = models.ForeignKey(ObjectA)
|
|
num = models.PositiveSmallIntegerField()
|
|
|
|
def __str__(self):
|
|
return self.name
|
|
|
|
@python_2_unicode_compatible
|
|
class ObjectC(models.Model):
|
|
name = models.CharField(max_length=50)
|
|
objecta = models.ForeignKey(ObjectA)
|
|
objectb = models.ForeignKey(ObjectB)
|
|
|
|
def __str__(self):
|
|
return self.name
|
|
|
|
@python_2_unicode_compatible
|
|
class SimpleCategory(models.Model):
|
|
name = models.CharField(max_length=15)
|
|
|
|
def __str__(self):
|
|
return self.name
|
|
|
|
@python_2_unicode_compatible
|
|
class SpecialCategory(SimpleCategory):
|
|
special_name = models.CharField(max_length=15)
|
|
|
|
def __str__(self):
|
|
return self.name + " " + self.special_name
|
|
|
|
@python_2_unicode_compatible
|
|
class CategoryItem(models.Model):
|
|
category = models.ForeignKey(SimpleCategory)
|
|
|
|
def __str__(self):
|
|
return "category item: " + str(self.category)
|
|
|
|
@python_2_unicode_compatible
|
|
class OneToOneCategory(models.Model):
|
|
new_name = models.CharField(max_length=15)
|
|
category = models.OneToOneField(SimpleCategory)
|
|
|
|
def __str__(self):
|
|
return "one2one " + self.new_name
|
|
|
|
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)
|
|
|
|
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)
|
|
jobs = models.ManyToManyField(Job, through=JobResponsibilities,
|
|
related_name='responsibilities')
|
|
|
|
def __str__(self):
|
|
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)
|
|
|
|
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')
|
|
|
|
|
|
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)
|
|
|
|
class Meta:
|
|
ordering = ('pk', )
|
|
|
|
def __str__(self):
|
|
return '%s' % self.pk
|
|
|
|
@python_2_unicode_compatible
|
|
class OrderItem(models.Model):
|
|
order = models.ForeignKey(Order, related_name='items')
|
|
status = models.IntegerField()
|
|
|
|
class Meta:
|
|
ordering = ('pk', )
|
|
|
|
def __str__(self):
|
|
return '%s' % self.pk
|