From 74e89c6a9d4cb833152dcb26378412cbb8df21aa Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Tue, 11 Jun 2024 10:24:39 -0400 Subject: [PATCH] Move to_sql to query helper --- app/lib/admin/metrics/measure/instance_accounts_measure.rb | 1 - app/lib/admin/metrics/measure/instance_followers_measure.rb | 1 - app/lib/admin/metrics/measure/instance_follows_measure.rb | 1 - .../admin/metrics/measure/instance_media_attachments_measure.rb | 1 - app/lib/admin/metrics/measure/instance_reports_measure.rb | 1 - app/lib/admin/metrics/measure/instance_statuses_measure.rb | 1 - app/lib/admin/metrics/measure/new_users_measure.rb | 1 - app/lib/admin/metrics/measure/opened_reports_measure.rb | 1 - app/lib/admin/metrics/measure/query_helper.rb | 2 +- app/lib/admin/metrics/measure/resolved_reports_measure.rb | 1 - app/lib/admin/metrics/measure/tag_servers_measure.rb | 1 - 11 files changed, 1 insertion(+), 11 deletions(-) diff --git a/app/lib/admin/metrics/measure/instance_accounts_measure.rb b/app/lib/admin/metrics/measure/instance_accounts_measure.rb index 9c110ea598..92f14015c9 100644 --- a/app/lib/admin/metrics/measure/instance_accounts_measure.rb +++ b/app/lib/admin/metrics/measure/instance_accounts_measure.rb @@ -36,7 +36,6 @@ class Admin::Metrics::Measure::InstanceAccountsMeasure < Admin::Metrics::Measure .select(:id) .where(account_domain_sql(params[:include_subdomains])) .where(daily_period(:accounts)) - .to_sql end def params diff --git a/app/lib/admin/metrics/measure/instance_followers_measure.rb b/app/lib/admin/metrics/measure/instance_followers_measure.rb index 0681f3d2cf..29e47da1c8 100644 --- a/app/lib/admin/metrics/measure/instance_followers_measure.rb +++ b/app/lib/admin/metrics/measure/instance_followers_measure.rb @@ -37,7 +37,6 @@ class Admin::Metrics::Measure::InstanceFollowersMeasure < Admin::Metrics::Measur .joins(:account) .where(account_domain_sql(params[:include_subdomains])) .where(daily_period(:follows)) - .to_sql end def params diff --git a/app/lib/admin/metrics/measure/instance_follows_measure.rb b/app/lib/admin/metrics/measure/instance_follows_measure.rb index e2fbb200f9..a2d717ccb9 100644 --- a/app/lib/admin/metrics/measure/instance_follows_measure.rb +++ b/app/lib/admin/metrics/measure/instance_follows_measure.rb @@ -37,7 +37,6 @@ class Admin::Metrics::Measure::InstanceFollowsMeasure < Admin::Metrics::Measure: .joins(:target_account) .where(account_domain_sql(params[:include_subdomains])) .where(daily_period(:follows)) - .to_sql end def params diff --git a/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb b/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb index b0aa81f52e..7eba483767 100644 --- a/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb +++ b/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb @@ -46,7 +46,6 @@ class Admin::Metrics::Measure::InstanceMediaAttachmentsMeasure < Admin::Metrics: .joins(:account) .where(account_domain_sql(params[:include_subdomains])) .where(daily_period(:media_attachments)) - .to_sql end def select_target diff --git a/app/lib/admin/metrics/measure/instance_reports_measure.rb b/app/lib/admin/metrics/measure/instance_reports_measure.rb index 2be5a6e784..e62dca5937 100644 --- a/app/lib/admin/metrics/measure/instance_reports_measure.rb +++ b/app/lib/admin/metrics/measure/instance_reports_measure.rb @@ -37,7 +37,6 @@ class Admin::Metrics::Measure::InstanceReportsMeasure < Admin::Metrics::Measure: .joins(:target_account) .where(account_domain_sql(params[:include_subdomains])) .where(daily_period(:reports)) - .to_sql end def params diff --git a/app/lib/admin/metrics/measure/instance_statuses_measure.rb b/app/lib/admin/metrics/measure/instance_statuses_measure.rb index e27da646c4..88c1d9138a 100644 --- a/app/lib/admin/metrics/measure/instance_statuses_measure.rb +++ b/app/lib/admin/metrics/measure/instance_statuses_measure.rb @@ -42,7 +42,6 @@ class Admin::Metrics::Measure::InstanceStatusesMeasure < Admin::Metrics::Measure SQL ) .where(daily_period(:statuses)) - .to_sql end def earliest_status_id diff --git a/app/lib/admin/metrics/measure/new_users_measure.rb b/app/lib/admin/metrics/measure/new_users_measure.rb index f4a7e5b293..e23d07fa70 100644 --- a/app/lib/admin/metrics/measure/new_users_measure.rb +++ b/app/lib/admin/metrics/measure/new_users_measure.rb @@ -25,6 +25,5 @@ class Admin::Metrics::Measure::NewUsersMeasure < Admin::Metrics::Measure::BaseMe User .select(:id) .where(daily_period(:users)) - .to_sql end end diff --git a/app/lib/admin/metrics/measure/opened_reports_measure.rb b/app/lib/admin/metrics/measure/opened_reports_measure.rb index 31ce99205a..9ea3a125d1 100644 --- a/app/lib/admin/metrics/measure/opened_reports_measure.rb +++ b/app/lib/admin/metrics/measure/opened_reports_measure.rb @@ -25,6 +25,5 @@ class Admin::Metrics::Measure::OpenedReportsMeasure < Admin::Metrics::Measure::B Report .select(:id) .where(daily_period(:reports)) - .to_sql end end diff --git a/app/lib/admin/metrics/measure/query_helper.rb b/app/lib/admin/metrics/measure/query_helper.rb index 120c05f1bb..90e78280ac 100644 --- a/app/lib/admin/metrics/measure/query_helper.rb +++ b/app/lib/admin/metrics/measure/query_helper.rb @@ -18,7 +18,7 @@ module Admin::Metrics::Measure::QueryHelper def sql_query_string <<~SQL.squish SELECT axis.*, ( - WITH data_source AS (#{data_source_query}) + WITH data_source AS (#{data_source_query.to_sql}) SELECT #{select_target} FROM data_source ) AS value FROM ( diff --git a/app/lib/admin/metrics/measure/resolved_reports_measure.rb b/app/lib/admin/metrics/measure/resolved_reports_measure.rb index a3b67ebc59..27bf8c0833 100644 --- a/app/lib/admin/metrics/measure/resolved_reports_measure.rb +++ b/app/lib/admin/metrics/measure/resolved_reports_measure.rb @@ -25,6 +25,5 @@ class Admin::Metrics::Measure::ResolvedReportsMeasure < Admin::Metrics::Measure: Report .select(:id) .where(daily_period(:reports, :action_taken_at)) - .to_sql end end diff --git a/app/lib/admin/metrics/measure/tag_servers_measure.rb b/app/lib/admin/metrics/measure/tag_servers_measure.rb index dfde12c818..542b8a7d19 100644 --- a/app/lib/admin/metrics/measure/tag_servers_measure.rb +++ b/app/lib/admin/metrics/measure/tag_servers_measure.rb @@ -38,7 +38,6 @@ class Admin::Metrics::Measure::TagServersMeasure < Admin::Metrics::Measure::Base SQL ) .where(daily_period(:statuses)) - .to_sql end def earliest_status_id