Skip to content

StringAgg: use default Value('') #9661

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

Merged
mtesauro merged 1 commit into from
Mar 4, 2024
Merged

StringAgg: use default Value('') #9661

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
3 changes: 2 additions & 1 deletion dojo/components/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from django.shortcuts import render
from django.db.models import Count, Q
from django.db.models.expressions import Value
from dojo.utils import add_breadcrumb, get_page_items
from dojo.filters import ComponentFilter
from dojo.components.sql_group_concat import Sql_GroupConcat
Expand All @@ -23,7 +24,7 @@ def components(request):
.order_by("component_name")
.annotate(
component_version=StringAgg(
"component_version", delimiter=separator, distinct=True
"component_version", delimiter=separator, distinct=True, default=Value('')
)
)
)
Expand Down
3 changes: 2 additions & 1 deletion dojo/product/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
from django.contrib.postgres.aggregates import StringAgg
from django.db import DEFAULT_DB_ALIAS, connection
from django.db.models import Sum, Count, Q, Max, Prefetch, F, OuterRef, Subquery
from django.db.models.expressions import Value
from django.db.models.query import QuerySet
from django.core.exceptions import ValidationError, PermissionDenied
from django.http import HttpResponseRedirect, Http404, JsonResponse, HttpRequest
Expand Down Expand Up @@ -238,7 +239,7 @@ def view_product_components(request, pid):
if connection.vendor == 'postgresql':
component_query = Finding.objects.filter(test__engagement__product__id=pid).values("component_name").order_by(
'component_name').annotate(
component_version=StringAgg('component_version', delimiter=separator, distinct=True))
component_version=StringAgg('component_version', delimiter=separator, distinct=True, default=Value('')))
else:
component_query = Finding.objects.filter(test__engagement__product__id=pid).values("component_name")
component_query = component_query.annotate(
Expand Down