From 1837fd0b2d596b141c3a764f6893dd7704eda56a Mon Sep 17 00:00:00 2001 From: Abdelkader Boudih Date: Thu, 18 Jan 2024 19:47:05 +0100 Subject: [PATCH] debug --- .github/workflows/ci.yml | 2 +- .github/workflows/ci_jruby.yml | 2 +- .github/workflows/ci_truffleruby.yml | 2 +- spec/spec_helper.rb | 1 - test/test_helper.rb | 1 - 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 76fff215..777e9fa0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,7 +75,7 @@ jobs: env: RAILS_VERSION: ${{ matrix.rails }} DATABASE_URL: ${{ matrix.adapter }} - SECONDARY_DATABASE_URL: ${{ matrix.adapter }} + SECONDARY_DATABASE_URL: ${{ matrix.adapter }}_secondary BUNDLE_GEMFILE: gemfiles/${{ matrix.rails }}.gemfile WITH_ADVISORY_LOCK_PREFIX: ${{ github.run_id }} run: bin/rake diff --git a/.github/workflows/ci_jruby.yml b/.github/workflows/ci_jruby.yml index b6569a3d..04f1d5af 100644 --- a/.github/workflows/ci_jruby.yml +++ b/.github/workflows/ci_jruby.yml @@ -64,7 +64,7 @@ jobs: env: RAILS_VERSION: ${{ matrix.rails }} DATABASE_URL: ${{ matrix.adapter }} - SECONDARY_DATABASE_URL: ${{ matrix.adapter }} + SECONDARY_DATABASE_URL: ${{ matrix.adapter }}_secondary BUNDLE_GEMFILE: gemfiles/${{ matrix.rails }}.gemfile WITH_ADVISORY_LOCK_PREFIX: ${{ github.run_id }} run: bin/rake diff --git a/.github/workflows/ci_truffleruby.yml b/.github/workflows/ci_truffleruby.yml index 33f79567..7dc07ab9 100644 --- a/.github/workflows/ci_truffleruby.yml +++ b/.github/workflows/ci_truffleruby.yml @@ -67,7 +67,7 @@ jobs: env: RAILS_VERSION: ${{ matrix.rails }} DATABASE_URL: ${{ matrix.adapter }} - SECONDARY_DATABASE_URL: ${{ matrix.adapter }} + SECONDARY_DATABASE_URL: ${{ matrix.adapter }}_secondary BUNDLE_GEMFILE: gemfiles/${{ matrix.rails }}.gemfile WITH_ADVISORY_LOCK_PREFIX: ${{ github.run_id }} run: bin/rake diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 5c79ccd1..2466790a 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -38,7 +38,6 @@ ActiveRecord::Migration.verbose = false ActiveRecord::Base.table_name_prefix = ENV['DB_PREFIX'].to_s ActiveRecord::Base.table_name_suffix = ENV['DB_SUFFIX'].to_s -ActiveRecord::Base.establish_connection def env_db @env_db ||= ActiveRecord::Base.connection_db_config.adapter.to_sym diff --git a/test/test_helper.rb b/test/test_helper.rb index d5d7b7a6..cdb6c6bc 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -31,7 +31,6 @@ def env_db ActiveRecord::Migration.verbose = false ActiveRecord::Base.table_name_prefix = ENV['DB_PREFIX'].to_s ActiveRecord::Base.table_name_suffix = ENV['DB_SUFFIX'].to_s -ActiveRecord::Base.establish_connection # Use in specs to skip some tests def sqlite?