github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-31 04:00:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert "DEV: Improve multisite db scripts in dev (#17337)" (#17801)

Browse Source 
This reverts commit 2e4056d18532435e6e68d79cceca5b8b280c6948.

Unfortunately, this broke db:create and db:drop when multisite config
wasn't present.
This commit is contained in:
Daniel Waterworth
2022-08-04 16:15:06 -05:00
committed by GitHub
parent 2d6bd30dd8
commit e0ece3a77e
4 changed files with 70 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/temporary_db.rb
View File

@ -104,13 +104,13 @@ class TemporaryDb
old_user = ENV["PGUSER"]
old_port = ENV["PGPORT"]
old_dev_db = ENV["DISCOURSE_DEV_DB"]
old_rails_test_db = ENV["RAILS_TEST_DB"]
old_rails_db = ENV["RAILS_DB"]
ENV["PGHOST"] = "localhost"
ENV["PGUSER"] = "discourse"
ENV["PGPORT"] = pg_port.to_s
ENV["DISCOURSE_DEV_DB"] = "discourse"
ENV["RAILS_TEST_DB"] = "discourse"
ENV["RAILS_DB"] = "discourse"
yield
ensure
@ -118,7 +118,7 @@ class TemporaryDb
ENV["PGUSER"] = old_user
ENV["PGPORT"] = old_port
ENV["DISCOURSE_DEV_DB"] = old_dev_db
ENV["RAILS_TEST_DB"] = old_rails_test_db
ENV["RAILS_DB"] = old_rails_db
end
def remove