remove async queries

pull/1/head
rebuilt 4 years ago
parent c7f8317084
commit 0dc99486f8

@ -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]

@ -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

@ -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

@ -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

@ -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

Loading…
Cancel
Save