From 85533626fc35fec710dc0d2a37d66717f92e2e03 Mon Sep 17 00:00:00 2001 From: Nigel Chin Date: Thu, 1 Jul 2021 21:42:29 +1000 Subject: [PATCH] Change GroupConcat to output textfield to avoid length limits --- aiarena/core/d_utils.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/aiarena/core/d_utils.py b/aiarena/core/d_utils.py index 9e3542e2..e06b6556 100644 --- a/aiarena/core/d_utils.py +++ b/aiarena/core/d_utils.py @@ -1,6 +1,6 @@ import logging -from django.db.models.fields import CharField -from django.db.models import Q, Aggregate, CharField +from django.db.models.fields import CharField, TextField +from django.db.models import Q, Aggregate from rest_framework.exceptions import ValidationError # File for housing utils that require 'django' or would break CI if placed in utils.py @@ -11,13 +11,12 @@ class GroupConcat(Aggregate): function = 'GROUP_CONCAT' template = '%(function)s(%(distinct)s%(expressions)s%(ordering)s%(separator)s)' - def __init__(self, expression, distinct=False, ordering=None, separator=',', **extra): + def __init__(self, expression, ordering=None, separator=',', **extra): super(GroupConcat, self).__init__( expression, - distinct='DISTINCT ' if distinct else '', ordering=' ORDER BY %s' % ordering if ordering is not None else '', separator=' SEPARATOR "%s"' % separator, - output_field=CharField(), + output_field=TextField(), **extra )