DEV: Compatibility with Discourse on Rails 6.1 (#21)

discourse · Apr 21, 2021 · 0d47e63 · 0d47e63
1 parent b3f511e
commit 0d47e63
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.discourse-compatibility b/.discourse-compatibility
@@ -0,0 +1 @@
+2.7.0.beta6: b3f511e1d2bcb7cedb0bf6c582efbda0a5488bd3
diff --git a/lib/internal_metric/global.rb b/lib/internal_metric/global.rb
@@ -161,7 +161,7 @@ def primary_site_readonly?
     end
 
     def test_postgres(master: true)
-      config = ActiveRecord::Base.connection_config
+      config = ActiveRecord::Base.connection_db_config.configuration_hash
 
       unless master
         if config[:replica_host]

diff --git a/spec/lib/internal_metric/global_spec.rb b/spec/lib/internal_metric/global_spec.rb
@@ -112,12 +112,14 @@ module DiscoursePrometheus::InternalMetric
 
     describe 'when a replica has been configured' do
       before do
-        config = ActiveRecord::Base.connection_config
+        config = ActiveRecord::Base.connection_db_config.configuration_hash.dup
 
         config.merge!(
           replica_host: 'localhost',
           replica_port: 1111
         )
+        ActiveRecord::Base.connection.disconnect!
+        ActiveRecord::Base.establish_connection(config)
       end
 
       it 'should collect the right metrics' do