Move to_sql to query helper

pull/30654/head
Matt Jankowski 2024-06-11 10:24:39 -04:00
parent 01ab13bbc3
commit 74e89c6a9d
11 changed files with 1 additions and 11 deletions

View File

@ -36,7 +36,6 @@ class Admin::Metrics::Measure::InstanceAccountsMeasure < Admin::Metrics::Measure
.select(:id) .select(:id)
.where(account_domain_sql(params[:include_subdomains])) .where(account_domain_sql(params[:include_subdomains]))
.where(daily_period(:accounts)) .where(daily_period(:accounts))
.to_sql
end end
def params def params

View File

@ -37,7 +37,6 @@ class Admin::Metrics::Measure::InstanceFollowersMeasure < Admin::Metrics::Measur
.joins(:account) .joins(:account)
.where(account_domain_sql(params[:include_subdomains])) .where(account_domain_sql(params[:include_subdomains]))
.where(daily_period(:follows)) .where(daily_period(:follows))
.to_sql
end end
def params def params

View File

@ -37,7 +37,6 @@ class Admin::Metrics::Measure::InstanceFollowsMeasure < Admin::Metrics::Measure:
.joins(:target_account) .joins(:target_account)
.where(account_domain_sql(params[:include_subdomains])) .where(account_domain_sql(params[:include_subdomains]))
.where(daily_period(:follows)) .where(daily_period(:follows))
.to_sql
end end
def params def params

View File

@ -46,7 +46,6 @@ class Admin::Metrics::Measure::InstanceMediaAttachmentsMeasure < Admin::Metrics:
.joins(:account) .joins(:account)
.where(account_domain_sql(params[:include_subdomains])) .where(account_domain_sql(params[:include_subdomains]))
.where(daily_period(:media_attachments)) .where(daily_period(:media_attachments))
.to_sql
end end
def select_target def select_target

View File

@ -37,7 +37,6 @@ class Admin::Metrics::Measure::InstanceReportsMeasure < Admin::Metrics::Measure:
.joins(:target_account) .joins(:target_account)
.where(account_domain_sql(params[:include_subdomains])) .where(account_domain_sql(params[:include_subdomains]))
.where(daily_period(:reports)) .where(daily_period(:reports))
.to_sql
end end
def params def params

View File

@ -42,7 +42,6 @@ class Admin::Metrics::Measure::InstanceStatusesMeasure < Admin::Metrics::Measure
SQL SQL
) )
.where(daily_period(:statuses)) .where(daily_period(:statuses))
.to_sql
end end
def earliest_status_id def earliest_status_id

View File

@ -25,6 +25,5 @@ class Admin::Metrics::Measure::NewUsersMeasure < Admin::Metrics::Measure::BaseMe
User User
.select(:id) .select(:id)
.where(daily_period(:users)) .where(daily_period(:users))
.to_sql
end end
end end

View File

@ -25,6 +25,5 @@ class Admin::Metrics::Measure::OpenedReportsMeasure < Admin::Metrics::Measure::B
Report Report
.select(:id) .select(:id)
.where(daily_period(:reports)) .where(daily_period(:reports))
.to_sql
end end
end end

View File

@ -18,7 +18,7 @@ module Admin::Metrics::Measure::QueryHelper
def sql_query_string def sql_query_string
<<~SQL.squish <<~SQL.squish
SELECT axis.*, ( SELECT axis.*, (
WITH data_source AS (#{data_source_query}) WITH data_source AS (#{data_source_query.to_sql})
SELECT #{select_target} FROM data_source SELECT #{select_target} FROM data_source
) AS value ) AS value
FROM ( FROM (

View File

@ -25,6 +25,5 @@ class Admin::Metrics::Measure::ResolvedReportsMeasure < Admin::Metrics::Measure:
Report Report
.select(:id) .select(:id)
.where(daily_period(:reports, :action_taken_at)) .where(daily_period(:reports, :action_taken_at))
.to_sql
end end
end end

View File

@ -38,7 +38,6 @@ class Admin::Metrics::Measure::TagServersMeasure < Admin::Metrics::Measure::Base
SQL SQL
) )
.where(daily_period(:statuses)) .where(daily_period(:statuses))
.to_sql
end end
def earliest_status_id def earliest_status_id