From 3105fef21af1c1141eec46d3be89c5da55b84d01 Mon Sep 17 00:00:00 2001 From: Claire Date: Thu, 3 Aug 2023 16:17:09 +0200 Subject: [PATCH] =?UTF-8?q?Rename=20=E2=80=9Cread=E2=80=9D=20database=20to?= =?UTF-8?q?=20=E2=80=9Creplica=E2=80=9D=20for=20consistency=20(#26326)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/application_record.rb | 2 +- config/database.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/application_record.rb b/app/models/application_record.rb index efff5cdad..c2de8fb2a 100644 --- a/app/models/application_record.rb +++ b/app/models/application_record.rb @@ -5,7 +5,7 @@ class ApplicationRecord < ActiveRecord::Base include Remotable - connects_to database: { writing: :primary, reading: ENV['DB_REPLICA_NAME'] || ENV['READ_DATABASE_URL'] ? :read : :primary } + connects_to database: { writing: :primary, reading: ENV['DB_REPLICA_NAME'] || ENV['REPLICA_DATABASE_URL'] ? :replica : :primary } class << self def update_index(_type_name, *_args, &_block) diff --git a/config/database.yml b/config/database.yml index d1fd65a0f..0907193fe 100644 --- a/config/database.yml +++ b/config/database.yml @@ -15,7 +15,7 @@ development: password: <%= (ENV['DB_PASS'] || '').to_json %> host: <%= ENV['DB_HOST'] %> port: <%= ENV['DB_PORT'] %> - read: + replica: <<: *default database: <%= ENV['DB_NAME'] || 'mastodon_development' %> username: <%= ENV['DB_USER'] %> @@ -35,7 +35,7 @@ test: password: <%= (ENV['DB_PASS'] || '').to_json %> host: <%= ENV['DB_HOST'] %> port: <%= ENV['DB_PORT'] %> - read: + replica: <<: *default database: <%= ENV['DB_NAME'] || 'mastodon' %>_test<%= ENV['TEST_ENV_NUMBER'] %> username: <%= ENV['DB_USER'] %> @@ -53,7 +53,7 @@ production: host: <%= ENV['DB_HOST'] || 'localhost' %> port: <%= ENV['DB_PORT'] || 5432 %> prepared_statements: <%= ENV['PREPARED_STATEMENTS'] || 'true' %> - read: + replica: <<: *default database: <%= ENV['DB_REPLICA_NAME'] ||ENV['DB_NAME'] || 'mastodon_production' %> username: <%= ENV['DB_REPLICA_USER'] ||ENV['DB_USER'] || 'mastodon' %>