Respect table name prefix/suffix for `truncate_all`

5 files changed, 67 insertions, 5 deletions

diff --git a/activerecord/lib/active_record/internal_metadata.rb b/activerecord/lib/active_record/internal_metadata.rb
index 88b0c828ae..e6166581f1 100644
--- a/activerecord/lib/active_record/internal_metadata.rb
+++ b/activerecord/lib/active_record/internal_metadata.rb
@@ -17,7 +17,7 @@ module ActiveRecord
       end
 
       def table_name
-        "#{table_name_prefix}#{ActiveRecord::Base.internal_metadata_table_name}#{table_name_suffix}"
+        "#{table_name_prefix}#{internal_metadata_table_name}#{table_name_suffix}"
       end
 
       def []=(key, value)
@@ -44,6 +44,10 @@ module ActiveRecord
           end
         end
       end
+
+      def drop_table
+        connection.drop_table table_name, if_exists: true
+      end
     end
   end
 end
diff --git a/activerecord/lib/active_record/schema_migration.rb b/activerecord/lib/active_record/schema_migration.rb
index 1fca1a18f6..74547de862 100644
--- a/activerecord/lib/active_record/schema_migration.rb
+++ b/activerecord/lib/active_record/schema_migration.rb
@@ -19,7 +19,7 @@ module ActiveRecord
       end
 
       def table_name
-        "#{table_name_prefix}#{ActiveRecord::Base.schema_migrations_table_name}#{table_name_suffix}"
+        "#{table_name_prefix}#{schema_migrations_table_name}#{table_name_suffix}"
       end
 
       def table_exists?
diff --git a/activerecord/lib/active_record/tasks/database_tasks.rb b/activerecord/lib/active_record/tasks/database_tasks.rb
index 155d2b0b98..7285c15477 100644
--- a/activerecord/lib/active_record/tasks/database_tasks.rb
+++ b/activerecord/lib/active_record/tasks/database_tasks.rb
@@ -186,8 +186,8 @@ module ActiveRecord
         ActiveRecord::Base.connected_to(database: { truncation: configuration }) do
           table_names = ActiveRecord::Base.connection.tables
           table_names -= [
-            ActiveRecord::Base.schema_migrations_table_name,
-            ActiveRecord::Base.internal_metadata_table_name
+            SchemaMigration.table_name,
+            InternalMetadata.table_name
           ]
 
           ActiveRecord::Base.connection.truncate_tables(*table_names)
diff --git a/activerecord/test/cases/migration/foreign_key_test.rb b/activerecord/test/cases/migration/foreign_key_test.rb
index ba21923d79..5f1057f093 100644
--- a/activerecord/test/cases/migration/foreign_key_test.rb
+++ b/activerecord/test/cases/migration/foreign_key_test.rb
@@ -155,7 +155,7 @@ if ActiveRecord::Base.connection.supports_foreign_keys?
 
       class ForeignKeyChangeColumnWithSuffixTest < ForeignKeyChangeColumnTest
         setup do
-          ActiveRecord::Base.table_name_suffix = "_p"
+          ActiveRecord::Base.table_name_suffix = "_s"
         end
 
         teardown do
diff --git a/activerecord/test/cases/tasks/database_tasks_test.rb b/activerecord/test/cases/tasks/database_tasks_test.rb
index 06f11108f9..86f3e3bf23 100644
--- a/activerecord/test/cases/tasks/database_tasks_test.rb
+++ b/activerecord/test/cases/tasks/database_tasks_test.rb
@@ -50,6 +50,8 @@ module ActiveRecord
       protected_environments = ActiveRecord::Base.protected_environments
       current_env            = ActiveRecord::Base.connection.migration_context.current_environment
 
+      InternalMetadata[:environment] = current_env
+
       assert_called_on_instance_of(
         ActiveRecord::MigrationContext,
         :current_version,
@@ -73,6 +75,9 @@ module ActiveRecord
     def test_raises_an_error_when_called_with_protected_environment_which_name_is_a_symbol
       protected_environments = ActiveRecord::Base.protected_environments
       current_env            = ActiveRecord::Base.connection.migration_context.current_environment
+
+      InternalMetadata[:environment] = current_env
+
       assert_called_on_instance_of(
         ActiveRecord::MigrationContext,
         :current_version,
@@ -951,11 +956,22 @@ module ActiveRecord
 
       fixtures :authors, :author_addresses
 
+      def setup
+        SchemaMigration.create_table
+        SchemaMigration.create!(version: "foo")
+        InternalMetadata.create_table
+        InternalMetadata.create!(key: "foo", value: "bar")
+      end
+
       def teardown
+        SchemaMigration.drop_table
+        InternalMetadata.drop_table
         ActiveRecord::Base.connection_handlers = { writing: ActiveRecord::Base.default_connection_handler }
       end
 
       def test_truncate_tables
+        assert_operator SchemaMigration.count, :>, 0
+        assert_operator InternalMetadata.count, :>, 0
         assert_operator Author.count, :>, 0
         assert_operator AuthorAddress.count, :>, 0
 
@@ -969,12 +985,54 @@ module ActiveRecord
           )
         end
 
+        assert_operator SchemaMigration.count, :>, 0
+        assert_operator InternalMetadata.count, :>, 0
         assert_equal 0, Author.count
         assert_equal 0, AuthorAddress.count
       ensure
         ActiveRecord::Base.configurations = old_configurations
       end
     end
+
+    class DatabaseTasksTruncateAllWithPrefixTest < DatabaseTasksTruncateAllTest
+      setup do
+        ActiveRecord::Base.table_name_prefix = "p_"
+
+        SchemaMigration.reset_table_name
+        SchemaMigration.reset_column_information
+        InternalMetadata.reset_table_name
+        InternalMetadata.reset_column_information
+      end
+
+      teardown do
+        ActiveRecord::Base.table_name_prefix = nil
+
+        SchemaMigration.reset_table_name
+        SchemaMigration.reset_column_information
+        InternalMetadata.reset_table_name
+        InternalMetadata.reset_column_information
+      end
+    end
+
+    class DatabaseTasksTruncateAllWithSuffixTest < DatabaseTasksTruncateAllTest
+      setup do
+        ActiveRecord::Base.table_name_suffix = "_s"
+
+        SchemaMigration.reset_table_name
+        SchemaMigration.reset_column_information
+        InternalMetadata.reset_table_name
+        InternalMetadata.reset_column_information
+      end
+
+      teardown do
+        ActiveRecord::Base.table_name_suffix = nil
+
+        SchemaMigration.reset_table_name
+        SchemaMigration.reset_column_information
+        InternalMetadata.reset_table_name
+        InternalMetadata.reset_column_information
+      end
+    end
   end
 
   class DatabaseTasksTruncateAllWithMultipleDatabasesTest < ActiveRecord::TestCase