From 0dc99486f86bf3fcbb0bf965a2c8b8f1920c9474 Mon Sep 17 00:00:00 2001
From: rebuilt <memoryman51@hotmail.com>
Date: Thu, 16 Jun 2022 17:08:55 -0700
Subject: [PATCH] remove async queries

---
 CHANGELOG.md                                  | 1 -
 app/controllers/overview_controller.rb        | 4 ++--
 app/controllers/sqm_application_controller.rb | 6 +++---
 config/environments/development.rb            | 1 -
 config/environments/production.rb             | 1 -
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9954bef8..63ef9ee8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -55,7 +55,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Precalculate response rates
 - Add page caching
 - Add counter caches
-- Add async queries
 
 ## [Unreleased]
 
diff --git a/app/controllers/overview_controller.rb b/app/controllers/overview_controller.rb
index 0ebb0921..9e15112a 100644
--- a/app/controllers/overview_controller.rb
+++ b/app/controllers/overview_controller.rb
@@ -23,10 +23,10 @@ class OverviewController < SqmApplicationController
   end
 
   def measures
-    @measures ||= Measure.all.includes(%i[scales admin_data_items category]).load_async
+    @measures ||= Measure.all.includes(%i[scales admin_data_items category])
   end
 
   def subcategories
-    @subcategories ||= Subcategory.all.load_async
+    @subcategories ||= Subcategory.all
   end
 end
diff --git a/app/controllers/sqm_application_controller.rb b/app/controllers/sqm_application_controller.rb
index 90a53893..c0061866 100644
--- a/app/controllers/sqm_application_controller.rb
+++ b/app/controllers/sqm_application_controller.rb
@@ -7,11 +7,11 @@ class SqmApplicationController < ApplicationController
 
   def set_schools_and_districts
     @district = District.find_by_slug district_slug
-    @districts = District.all.order(:name).load_async
+    @districts = District.all.order(:name)
     @school = School.find_by_slug(school_slug)
-    @schools = School.includes([:district]).where(district: @district).order(:name).load_async
+    @schools = School.includes([:district]).where(district: @district).order(:name)
     @academic_year = AcademicYear.find_by_range params[:year]
-    @academic_years = AcademicYear.all.order(range: :desc).load_async
+    @academic_years = AcademicYear.all.order(range: :desc)
   end
 
   def district_slug
diff --git a/config/environments/development.rb b/config/environments/development.rb
index f497c5cb..a73fd411 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -71,5 +71,4 @@ Rails.application.configure do
   config.file_watcher = ActiveSupport::EventedFileUpdateChecker
 
   config.action_controller.include_all_helpers = false
-  config.active_record.async_query_executor = :global_thread_pool
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 91121d12..6609cef7 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -111,5 +111,4 @@ Rails.application.configure do
   # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session
 
   config.action_controller.include_all_helpers = false
-  config.active_record.async_query_executor = :global_thread_pool
 end