Fixing test order issues

1 files changed, 8 insertions, 2 deletions

diff --git a/activerecord/test/cases/adapters/postgresql/extension_migration_test.rb b/activerecord/test/cases/adapters/postgresql/extension_migration_test.rb
index 9387ca73e1..91058f8681 100644
--- a/activerecord/test/cases/adapters/postgresql/extension_migration_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/extension_migration_test.rb
@@ -26,17 +26,23 @@ class PostgresqlExtensionMigrationTest < ActiveRecord::TestCase
       return skip("no extension support")
     end
 
+    @old_schema_migration_tabel_name = ActiveRecord::SchemaMigration.table_name
+    @old_tabel_name_prefix = ActiveRecord::Base.table_name_prefix
+    @old_tabel_name_suffix = ActiveRecord::Base.table_name_suffix
+
     ActiveRecord::Base.table_name_prefix = "p_"
     ActiveRecord::Base.table_name_suffix = "_s"
     ActiveRecord::SchemaMigration.delete_all rescue nil
+    ActiveRecord::SchemaMigration.table_name = "p_schema_migrations_s"
     ActiveRecord::Migration.verbose = false
   end
 
   def teardown
-    ActiveRecord::Base.table_name_prefix = ""
-    ActiveRecord::Base.table_name_suffix = ""
+    ActiveRecord::Base.table_name_prefix = @old_tabel_name_prefix
+    ActiveRecord::Base.table_name_suffix = @old_tabel_name_suffix
     ActiveRecord::SchemaMigration.delete_all rescue nil
     ActiveRecord::Migration.verbose = true
+    ActiveRecord::SchemaMigration.table_name = @old_schema_migration_tabel_name
 
     super
   end