Skip to content

Fixed #36584 -- Fixed RHS subquery cardinality check to allow ForeignObject selection #19799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixed #36584 -- Fixed RHS subquery cardinality check to allow ForeignObject selection #19799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions django/db/models/sql/query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1249,12 +1249,11 @@ def add_annotation(self, annotation, alias, select=True):

@property
def _subquery_fields_len(self):
if self.has_select_fields:
return sum(
len(self.model._meta.pk_fields) if field == "pk" else 1
for field in self.selected
)
return len(self.model._meta.pk_fields)
if not self.has_select_fields or not self.select:
return len(self.model._meta.pk_fields)
return len(self.select) + sum(
len(expr.targets) - 1 for expr in self.select if isinstance(expr, ColPairs)
)

def resolve_expression(self, query, *args, **kwargs):
clone = self.clone()
Expand Down
5 changes: 5 additions & 0 deletions tests/composite_pk/test_filter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,11 @@ def test_filter_users_by_comments_subquery(self):
queryset = User.objects.filter(comments__in=subquery)
self.assertSequenceEqual(queryset, (self.user_2,))

def test_filter_comments_by_users_subquery(self):
subquery = Comment.objects.filter(id=3).values("user")
queryset = Comment.objects.filter(user__in=subquery)
self.assertSequenceEqual(queryset, (self.comment_3,))

def test_cannot_cast_pk(self):
msg = "Cast expression does not support composite primary keys."
with self.assertRaisesMessage(ValueError, msg):
Expand Down
Loading