Merge branch 'dev' into dev-ars

This commit is contained in:
Iron_Felix 2025-11-22 08:36:34 +03:00
commit 8427288daf
44 changed files with 1303 additions and 1272 deletions

View file

@ -78,7 +78,10 @@ SELECT
t.*,
i.storage_type::text as title_storage_type,
i.image_path as title_image_path,
jsonb_agg(g.tag_name)'[]'::jsonb as tag_names,
COALESCE(
jsonb_agg(g.tag_names) FILTER (WHERE g.tag_names IS NOT NULL),
'[]'::jsonb
) as tag_names,
s.studio_name as studio_name,
s.illust_id as studio_illust_id,
s.studio_desc as studio_desc,
@ -101,7 +104,10 @@ SELECT
t.*,
i.storage_type::text as title_storage_type,
i.image_path as title_image_path,
jsonb_agg(g.tag_name)'[]'::jsonb as tag_names,
COALESCE(
jsonb_agg(g.tag_names) FILTER (WHERE g.tag_names IS NOT NULL),
'[]'::jsonb
) as tag_names,
s.studio_name as studio_name,
s.illust_id as studio_illust_id,
s.studio_desc as studio_desc,