From 128da54eb18b8b3fa87d8c87e9ff70e56f98561d Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Fri, 16 Sep 2016 12:26:59 +0200 Subject: [PATCH] Removing json_build_object postgresql calls --- taiga/projects/tasks/utils.py | 9 ++++++--- taiga/projects/userstories/utils.py | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/taiga/projects/tasks/utils.py b/taiga/projects/tasks/utils.py index d5775d19..0d8661fc 100644 --- a/taiga/projects/tasks/utils.py +++ b/taiga/projects/tasks/utils.py @@ -44,9 +44,12 @@ def attach_user_story_extra_info(queryset, as_field="user_story_extra_info"): "epics_epic"."ref" AS "ref", "epics_epic"."subject" AS "subject", "epics_epic"."color" AS "color", - json_build_object('id', "projects_project"."id", - 'name', "projects_project"."name", - 'slug', "projects_project"."slug") AS "project" + (SELECT row_to_json(p) + FROM (SELECT "projects_project"."id" AS "id", + "projects_project"."name" AS "name", + "projects_project"."slug" AS "slug" + ) p + ) AS "project" FROM "epics_relateduserstory" INNER JOIN "epics_epic" ON "epics_epic"."id" = "epics_relateduserstory"."epic_id" diff --git a/taiga/projects/userstories/utils.py b/taiga/projects/userstories/utils.py index ef5e8ba0..57e4ecd3 100644 --- a/taiga/projects/userstories/utils.py +++ b/taiga/projects/userstories/utils.py @@ -114,9 +114,12 @@ def attach_epics(queryset, as_field="epics_attr"): "epics_epic"."ref" AS "ref", "epics_epic"."subject" AS "subject", "epics_epic"."color" AS "color", - json_build_object('id', "projects_project"."id", - 'name', "projects_project"."name", - 'slug', "projects_project"."slug") AS "project" + (SELECT row_to_json(p) + FROM (SELECT "projects_project"."id" AS "id", + "projects_project"."name" AS "name", + "projects_project"."slug" AS "slug" + ) p + ) AS "project" FROM "epics_relateduserstory" INNER JOIN "epics_epic" ON "epics_epic"."id" = "epics_relateduserstory"."epic_id" INNER JOIN "projects_project" ON "projects_project"."id" = "epics_epic"."project_id"