jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

versions: default ARCHIVE_DATABASE_URL to DATABASE_URL.

Browse Source 
Make it so that when ARCHIVE_DATABASE_URL isn't set, it defaults to
DATABASE_URL. In other words, if you don't have a separate archive
database configured, then default to using the main database for
post/pool versions.

Fixes an issue where running the test suite would fail if you didn't
explicitly set ARCHIVE_DATABASE_URL because it tried to use
`archive_test` as the post/pool versions database name.
This commit is contained in:
evazion
2021-09-21 22:12:33 -05:00
parent d953ca694c
commit 5af21f03de
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/test.yaml vendored
View File

@@ -37,7 +37,6 @@ jobs:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
DATABASE_URL: postgresql://danbooru:danbooru@postgres/danbooru DATABASE_URL: postgresql://danbooru:danbooru@postgres/danbooru
ARCHIVE_DATABASE_URL: postgresql://danbooru:danbooru@postgres/danbooru
DANBOORU_SECRET_KEY_BASE: 1234 DANBOORU_SECRET_KEY_BASE: 1234
DANBOORU_AWS_SQS_ENABLED: false DANBOORU_AWS_SQS_ENABLED: false
DANBOORU_TWITTER_API_KEY: ${{ secrets.DANBOORU_TWITTER_API_KEY }} DANBOORU_TWITTER_API_KEY: ${{ secrets.DANBOORU_TWITTER_API_KEY }}

2
app/models/pool_version.rb
View File

@@ -7,7 +7,7 @@ class PoolVersion < ApplicationRecord
end end
def self.database_url def self.database_url
ENV["ARCHIVE_DATABASE_URL"] || "archive_#{Rails.env}".to_sym ENV["ARCHIVE_DATABASE_URL"] || ENV["DATABASE_URL"]
end end
establish_connection database_url if enabled? establish_connection database_url if enabled?

2
app/models/post_version.rb
View File

@@ -10,7 +10,7 @@ class PostVersion < ApplicationRecord
end end
def self.database_url def self.database_url
ENV["ARCHIVE_DATABASE_URL"] || "archive_#{Rails.env}".to_sym ENV["ARCHIVE_DATABASE_URL"] || ENV["DATABASE_URL"]
end end
establish_connection database_url if enabled? establish_connection database_url if enabled?