From 0343c9b700c145d3f76b6fffc0c3141e516a78c9 Mon Sep 17 00:00:00 2001 From: Santo Cariotti Date: Sun, 18 Sep 2022 14:55:26 +0200 Subject: Fix aggregator for model with no uploads --- src/models/model.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/models/model.rs b/src/models/model.rs index cf539c9..f8e7057 100644 --- a/src/models/model.rs +++ b/src/models/model.rs @@ -130,10 +130,10 @@ impl Model { SELECT models.*, json_build_object('id', users.id, 'email', users.email, 'username', users.username, 'is_staff', users.is_staff) as author, - json_agg(uploads.*) as uploads + json_agg(uploads.*) filter (where uploads.* is not null) as uploads FROM models JOIN users ON users.id = models.author_id - JOIN uploads ON uploads.model_id = models.id + LEFT JOIN uploads ON uploads.model_id = models.id WHERE models.id = $1 GROUP BY models.id, users.id "#) @@ -152,10 +152,10 @@ impl Model { SELECT models.*, json_build_object('id', users.id, 'email', users.email, 'username', users.username, 'is_staff', users.is_staff) as author, - json_agg(uploads.*) as uploads + json_agg(uploads.*) filter (where uploads.* is not null) as uploads FROM models JOIN users ON users.id = models.author_id - JOIN uploads ON uploads.model_id = models.id + LEFT JOIN uploads ON uploads.model_id = models.id GROUP BY models.id, users.id LIMIT $1 OFFSET $2 "#) -- cgit v1.2.3-71-g8e6c