Merge remote-tracking branch 'parent/main' into upstream-20240510

This commit is contained in:
KMY 2024-05-10 06:40:33 +09:00
commit 10eec0e102
40 changed files with 365 additions and 88 deletions

View file

@ -50,7 +50,7 @@ class Admin::Metrics::Measure::InstanceMediaAttachmentsMeasure < Admin::Metrics:
WHERE date_trunc('day', media_attachments.created_at)::date = axis.period
AND #{account_domain_sql(params[:include_subdomains])}
)
SELECT COALESCE(SUM(size), 0)::bigint FROM new_media_attachments
SELECT COALESCE(SUM(size), 0) FROM new_media_attachments
) AS value
FROM (
SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, interval '1 day') AS period