Skip to content
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

Jump to bottom

Select proper default for output_field based on distinct value #647

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open

Select proper default for output_field based on distinct value #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9c472ce
Select proper default for `output_field` based on distinct value
Apr 26, 2020
14219c4
BUGFIX: tie to CharField if separator given
Apr 26, 2020
5304b33
Fix distinct=True test
Apr 26, 2020
8a154d1
Globally fix output field on tests
Apr 26, 2020
db16f43
BUGFIX: empty separator should use CharField
Apr 26, 2020
b97fdbe
Cast to list return of `reverse()`
Apr 26, 2020
c19ce87
Broken construction of comparison set
Apr 26, 2020
a653813
Broken construction of comparison set (II)
Apr 26, 2020
f9858c0
Simplify set construction
javiplx Apr 26, 2020
4ca0ef0
Get happier linter ...
Apr 26, 2020
4ad8186
Get even more happy linter ...
Apr 26, 2020
640da6f
Alphabetical orden matters ...
Apr 26, 2020
ada23ea
Add test for return type for distinct GroupConcat
javiplx May 30, 2020
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
10 changes: 8 additions & 2 deletions src/django_mysql/models/aggregates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
from django.db.models import Aggregate, CharField

from django_mysql.models.fields import ListCharField, SetCharField


class BitAnd(Aggregate):
function = "BIT_AND"
Expand All @@ -24,8 +26,12 @@ def __init__(
):

if "output_field" not in extra:
# This can/will be improved to SetTextField or ListTextField
extra["output_field"] = CharField()
if separator is not None:
extra["output_field"] = CharField()
elif distinct:
extra["output_field"] = SetCharField(CharField())
else:
extra["output_field"] = ListCharField(CharField())

super().__init__(expression, **extra)

Expand Down
15 changes: 9 additions & 6 deletions tests/testapp/test_aggregates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,11 @@ def setUp(self):

def test_basic_aggregate_ids(self):
out = self.shakes.tutees.aggregate(tids=GroupConcat("id"))
concatted_ids = ",".join(self.str_tutee_ids)
assert out == {"tids": concatted_ids}
assert out == {"tids": self.str_tutee_ids}

def test_distinct_aggregate_ids(self):
out = self.shakes.tutees.aggregate(tids=GroupConcat("id", distinct=True))
assert out == {"tids": set(self.str_tutee_ids)}

def test_basic_annotate_ids(self):
concat = GroupConcat("tutees__id")
Expand Down Expand Up @@ -104,14 +107,14 @@ def test_separator_big(self):
def test_expression(self):
concat = GroupConcat(F("id") + 1)
out = self.shakes.tutees.aggregate(tids=concat)
concatted_ids = ",".join([str(self.jk.id + 1), str(self.grisham.id + 1)])
concatted_ids = [str(self.jk.id + 1), str(self.grisham.id + 1)]
assert out == {"tids": concatted_ids}

def test_application_order(self):
out = Author.objects.exclude(id=self.shakes.id).aggregate(
tids=GroupConcat("tutor_id", distinct=True)
)
assert out == {"tids": str(self.shakes.id)}
assert out == {"tids": {str(self.shakes.id)}}

@override_mysql_variables(SQL_MODE="ANSI")
def test_separator_ansi_mode(self):
Expand All @@ -127,11 +130,11 @@ def test_ordering_invalid(self):

def test_ordering_asc(self):
out = self.shakes.tutees.aggregate(tids=GroupConcat("id", ordering="asc"))
assert out == {"tids": ",".join(self.str_tutee_ids)}
assert out == {"tids": self.str_tutee_ids}

def test_ordering_desc(self):
out = self.shakes.tutees.aggregate(tids=GroupConcat("id", ordering="desc"))
assert out == {"tids": ",".join(reversed(self.str_tutee_ids))}
assert out == {"tids": list(reversed(self.str_tutee_ids))}

def test_separator_ordering(self):
concat = GroupConcat("id", separator=":", ordering="asc")
Expand Down