From 8abec0280504c279f94cc51037f6e18b3a34dfbb Mon Sep 17 00:00:00 2001 From: Geremia Taglialatela Date: Sat, 8 Oct 2022 12:27:26 +0200 Subject: [PATCH] Fix support for dbconsole on Rails edge Ref: - Move dbconsole logic to Active Record connection adapter: rails/rails@4bcb8e4 rails/rails#46093 - Use adapter_class instead of connection_class for adapters: rails/rails@5bb357f rails/rails#46166 --- lib/active_record/connection_adapters/chronomodel_adapter.rb | 3 +++ lib/chrono_model.rb | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/active_record/connection_adapters/chronomodel_adapter.rb b/lib/active_record/connection_adapters/chronomodel_adapter.rb index 265d88f3..60321ad8 100644 --- a/lib/active_record/connection_adapters/chronomodel_adapter.rb +++ b/lib/active_record/connection_adapters/chronomodel_adapter.rb @@ -2,6 +2,9 @@ module ActiveRecord module ConnectionHandling + def chronomodel_adapter_class + ConnectionAdapters::PostgreSQLAdapter + end # Install the new adapter in ActiveRecord. This approach is required because # the PG adapter defines +add_column+ itself, thus making impossible to use diff --git a/lib/chrono_model.rb b/lib/chrono_model.rb index 07f0fa55..73923430 100644 --- a/lib/chrono_model.rb +++ b/lib/chrono_model.rb @@ -77,7 +77,7 @@ def chrono? prepend ChronoModel::Patches::Batches::BatchEnumerator end -if defined?(Rails::DBConsole) +if defined?(Rails::DBConsole) && Rails.version < '7.1' Rails::DBConsole.instance_eval do if Rails.version < '6.1' prepend ChronoModel::Patches::DBConsole::Config