Skip to content

Commit b16b516

Browse files
authored
Merge pull request rails#50922 from fatkodima/fix-loading-schema-cache-database_tasks-false
Fix loading schema cache when all databases have disabled database tasks
2 parents b0b481a + b8585b3 commit b16b516

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed

activerecord/lib/active_record/railtie.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ class Railtie < Rails::Railtie # :nodoc:
147147
config.after_initialize do |app|
148148
ActiveSupport.on_load(:active_record) do
149149
db_config = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env).first
150+
next if db_config.nil?
150151

151152
filename = ActiveRecord::Tasks::DatabaseTasks.cache_dump_filename(db_config)
152153

railties/test/application/initializers/frameworks_test.rb

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,23 @@ def show
239239
ActiveRecord::Base.connection.drop_table("posts", if_exists: true) # force drop posts table for test.
240240
end
241241

242+
test "skips checking for schema cache dump when all databases skipping database tasks" do
243+
app_file "config/database.yml", <<-YAML
244+
development:
245+
database: storage/default.sqlite3
246+
adapter: sqlite3
247+
database_tasks: false
248+
YAML
249+
250+
add_to_config <<-RUBY
251+
config.eager_load = true
252+
RUBY
253+
254+
assert_nothing_raised do
255+
require "#{app_path}/config/environment"
256+
end
257+
end
258+
242259
test "expire schema cache dump" do
243260
rails %w(generate model post title:string)
244261
rails %w(db:migrate db:schema:cache:dump db:rollback)

0 commit comments

Comments
 (0)