monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Align `TagServersMeasure` to use `WITH` query style similar to others (#29435)

This commit is contained in:
Matt Jankowski 2024-02-29 06:00:58 -05:00 committed by GitHub
parent 14c65180df
commit e1fcb02867
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/lib/admin/metrics/measure/tag_servers_measure.rb
View File

@ -28,7 +28,8 @@ class Admin::Metrics::Measure::TagServersMeasure < Admin::Metrics::Measure::Base
def sql_query_string def sql_query_string
<<~SQL.squish <<~SQL.squish
SELECT axis.*, ( SELECT axis.*, (
SELECT count(distinct accounts.domain) AS value WITH tag_servers AS (
SELECT DISTINCT accounts.domain
FROM statuses FROM statuses
INNER JOIN statuses_tags ON statuses.id = statuses_tags.status_id INNER JOIN statuses_tags ON statuses.id = statuses_tags.status_id
INNER JOIN accounts ON statuses.account_id = accounts.id INNER JOIN accounts ON statuses.account_id = accounts.id
@ -36,6 +37,8 @@ class Admin::Metrics::Measure::TagServersMeasure < Admin::Metrics::Measure::Base
AND statuses.id BETWEEN :earliest_status_id AND :latest_status_id AND statuses.id BETWEEN :earliest_status_id AND :latest_status_id
AND date_trunc('day', statuses.created_at)::date = axis.period AND date_trunc('day', statuses.created_at)::date = axis.period
) )
SELECT COUNT(*) FROM tag_servers
) AS value
FROM ( FROM (
SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, interval '1 day') AS period SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, interval '1 day') AS period
) as axis ) as axis