diff options
| -rw-r--r-- | activejob/lib/active_job/logging.rb | 4 | ||||
| -rw-r--r-- | activejob/lib/active_job/timezones.rb | 2 | ||||
| -rw-r--r-- | activejob/lib/active_job/translation.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/tasks/database_tasks.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/cases/tasks/database_tasks_test.rb | 16 | ||||
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 1 |
6 files changed, 24 insertions, 5 deletions
diff --git a/activejob/lib/active_job/logging.rb b/activejob/lib/active_job/logging.rb index 96c48d04a7..3312857ac7 100644 --- a/activejob/lib/active_job/logging.rb +++ b/activejob/lib/active_job/logging.rb @@ -11,13 +11,13 @@ module ActiveJob included do cattr_accessor :logger, default: ActiveSupport::TaggedLogging.new(ActiveSupport::Logger.new(STDOUT)) - around_enqueue do |_, block, _| + around_enqueue do |_, block| tag_logger do block.call end end - around_perform do |job, block, _| + around_perform do |job, block| tag_logger(job.class.name, job.job_id) do payload = { adapter: job.class.queue_adapter, job: job } ActiveSupport::Notifications.instrument("perform_start.active_job", payload.dup) diff --git a/activejob/lib/active_job/timezones.rb b/activejob/lib/active_job/timezones.rb index 83f459aea5..ac018eb752 100644 --- a/activejob/lib/active_job/timezones.rb +++ b/activejob/lib/active_job/timezones.rb @@ -5,7 +5,7 @@ module ActiveJob extend ActiveSupport::Concern included do - around_perform do |job, block, _| + around_perform do |job, block| Time.use_zone(job.timezone, &block) end end diff --git a/activejob/lib/active_job/translation.rb b/activejob/lib/active_job/translation.rb index fb45c80d67..0fd9b9fc06 100644 --- a/activejob/lib/active_job/translation.rb +++ b/activejob/lib/active_job/translation.rb @@ -5,7 +5,7 @@ module ActiveJob extend ActiveSupport::Concern included do - around_perform do |job, block, _| + around_perform do |job, block| I18n.with_locale(job.locale, &block) end end diff --git a/activerecord/lib/active_record/tasks/database_tasks.rb b/activerecord/lib/active_record/tasks/database_tasks.rb index 0883e80d23..d8e0cd1e30 100644 --- a/activerecord/lib/active_record/tasks/database_tasks.rb +++ b/activerecord/lib/active_record/tasks/database_tasks.rb @@ -315,12 +315,16 @@ module ActiveRecord environments << "test" if environment == "development" ActiveRecord::Base.configurations.slice(*environments).each do |configuration_environment, configuration| + next unless configuration["database"] + yield configuration, configuration_environment end end def each_local_configuration ActiveRecord::Base.configurations.each_value do |configuration| + next unless configuration["database"] + if local_database?(configuration) yield configuration else diff --git a/activerecord/test/cases/tasks/database_tasks_test.rb b/activerecord/test/cases/tasks/database_tasks_test.rb index da7ca27f13..21226352ff 100644 --- a/activerecord/test/cases/tasks/database_tasks_test.rb +++ b/activerecord/test/cases/tasks/database_tasks_test.rb @@ -124,6 +124,14 @@ module ActiveRecord ActiveRecord::Base.connection_handler.stubs(:establish_connection) end + def test_ignores_configurations_without_databases + @configurations["development"].merge!("database" => nil) + + ActiveRecord::Tasks::DatabaseTasks.expects(:create).never + + ActiveRecord::Tasks::DatabaseTasks.create_all + end + def test_ignores_remote_databases @configurations["development"].merge!("host" => "my.server.tld") $stderr.stubs(:puts).returns(nil) @@ -242,6 +250,14 @@ module ActiveRecord ActiveRecord::Base.stubs(:configurations).returns(@configurations) end + def test_ignores_configurations_without_databases + @configurations[:development].merge!("database" => nil) + + ActiveRecord::Tasks::DatabaseTasks.expects(:drop).never + + ActiveRecord::Tasks::DatabaseTasks.drop_all + end + def test_ignores_remote_databases @configurations[:development].merge!("host" => "my.server.tld") $stderr.stubs(:puts).returns(nil) diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 1bdaf91c46..b42ffe50d8 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -179,7 +179,6 @@ module Rails values.reverse_merge!(shared) end end - loaded_yaml.reject! { |_, values| !values["database"] } Hash.new(shared).merge(loaded_yaml) elsif ENV["DATABASE_URL"] # Value from ENV['DATABASE_URL'] is set to default database connection |