diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 9fcb6e2a0..3e6e31a3c 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -37,7 +37,6 @@ jobs: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} DATABASE_URL: postgresql://danbooru:danbooru@postgres/danbooru - ARCHIVE_DATABASE_URL: postgresql://danbooru:danbooru@postgres/danbooru DANBOORU_SECRET_KEY_BASE: 1234 DANBOORU_AWS_SQS_ENABLED: false DANBOORU_TWITTER_API_KEY: ${{ secrets.DANBOORU_TWITTER_API_KEY }} diff --git a/app/models/pool_version.rb b/app/models/pool_version.rb index 6645ccb2b..b4efa26d7 100644 --- a/app/models/pool_version.rb +++ b/app/models/pool_version.rb @@ -7,7 +7,7 @@ class PoolVersion < ApplicationRecord end def self.database_url - ENV["ARCHIVE_DATABASE_URL"] || "archive_#{Rails.env}".to_sym + ENV["ARCHIVE_DATABASE_URL"] || ENV["DATABASE_URL"] end establish_connection database_url if enabled? diff --git a/app/models/post_version.rb b/app/models/post_version.rb index f8033fa86..15ce93239 100644 --- a/app/models/post_version.rb +++ b/app/models/post_version.rb @@ -10,7 +10,7 @@ class PostVersion < ApplicationRecord end def self.database_url - ENV["ARCHIVE_DATABASE_URL"] || "archive_#{Rails.env}".to_sym + ENV["ARCHIVE_DATABASE_URL"] || ENV["DATABASE_URL"] end establish_connection database_url if enabled?