From f4a3bf06a1e43b7f9fef8c60e31dfb2aa6355621 Mon Sep 17 00:00:00 2001
From: Jean Boussier <jean.boussier@gmail.com>
Date: Thu, 10 Jun 2021 16:43:21 +0200
Subject: [PATCH] Make `maintain_test_schema` a module instance variable

Followup: https://github.com/rails/rails/pull/42442
---
 activerecord/lib/active_record.rb           | 3 +++
 activerecord/lib/active_record/core.rb      | 2 --
 activerecord/lib/active_record/migration.rb | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb
index ac291afbd2..86c5b966dc 100644
--- a/activerecord/lib/active_record.rb
+++ b/activerecord/lib/active_record.rb
@@ -200,6 +200,9 @@ module ActiveRecord
   singleton_class.attr_accessor :queues
   self.queues = {}
 
+  singleton_class.attr_accessor :maintain_test_schema
+  self.maintain_test_schema = nil
+
   ##
   # :singleton-method:
   # Specify a threshold for the size of query result sets. If the number of
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb
index a6f5ddfebb..8fa7518c57 100644
--- a/activerecord/lib/active_record/core.rb
+++ b/activerecord/lib/active_record/core.rb
@@ -65,8 +65,6 @@ module ActiveRecord
       # to the database while the app is running.
       class_attribute :enumerate_columns_in_select_statements, instance_accessor: false, default: false
 
-      mattr_accessor :maintain_test_schema, instance_accessor: false
-
       class_attribute :belongs_to_required_by_default, instance_accessor: false
 
       class_attribute :strict_loading_by_default, instance_accessor: false, default: false
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb
index bf26aaba5f..279461d892 100644
--- a/activerecord/lib/active_record/migration.rb
+++ b/activerecord/lib/active_record/migration.rb
@@ -651,7 +651,7 @@ module ActiveRecord
       end
 
       def maintain_test_schema! #:nodoc:
-        if ActiveRecord::Base.maintain_test_schema
+        if ActiveRecord.maintain_test_schema
           suppress_messages { load_schema_if_pending! }
         end
       end