More exercise table name prefix and suffix tests

5 files changed, 97 insertions, 33 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb
index 2cb0a2a4df..63d444b63b 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb
@@ -127,6 +127,9 @@ module ActiveRecord
           end
 
           def foreign_key_in_create(from_table, to_table, options)
+            prefix = ActiveRecord::Base.table_name_prefix
+            suffix = ActiveRecord::Base.table_name_suffix
+            to_table = "#{prefix}#{to_table}#{suffix}"
             options = foreign_key_options(from_table, to_table, options)
             accept ForeignKeyDefinition.new(from_table, to_table, options)
           end
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
index 198898b764..d0afe638c3 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
@@ -398,10 +398,7 @@ module ActiveRecord
       end
 
       def foreign_key(table_name, options = {}) # :nodoc:
-        table_name_prefix = ActiveRecord::Base.table_name_prefix
-        table_name_suffix = ActiveRecord::Base.table_name_suffix
-        table_name = "#{table_name_prefix}#{table_name}#{table_name_suffix}"
-        foreign_keys.push([table_name, options])
+        foreign_keys << [table_name, options]
       end
 
       # Appends <tt>:datetime</tt> columns <tt>:created_at</tt> and
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
index d88e75d692..78e153bcc9 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -1029,9 +1029,7 @@ module ActiveRecord
       end
 
       def foreign_key_column_for(table_name) # :nodoc:
-        prefix = Base.table_name_prefix
-        suffix = Base.table_name_suffix
-        name = table_name.to_s =~ /#{prefix}(.+)#{suffix}/ ? $1 : table_name.to_s
+        name = strip_table_name_prefix_and_suffix(table_name)
         "#{name.singularize}_id"
       end
 
@@ -1328,6 +1326,12 @@ module ActiveRecord
           { column: column_names }
         end
 
+        def strip_table_name_prefix_and_suffix(table_name)
+          prefix = Base.table_name_prefix
+          suffix = Base.table_name_suffix
+          table_name.to_s =~ /#{prefix}(.+)#{suffix}/ ? $1 : table_name.to_s
+        end
+
         def foreign_key_name(table_name, options)
           options.fetch(:name) do
             identifier = "#{table_name}_#{options.fetch(:column)}_fk"
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
index 7b3630662b..02bbe1ea45 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
@@ -320,6 +320,9 @@ module ActiveRecord
       def remove_column(table_name, column_name, type = nil, options = {}) #:nodoc:
         alter_table(table_name) do |definition|
           definition.remove_column column_name
+          definition.foreign_keys.delete_if do |_, fk_options|
+            fk_options[:column] == column_name.to_s
+          end
         end
       end
 
@@ -431,7 +434,8 @@ module ActiveRecord
               if column = rename[fk.options[:column]]
                 fk.options[:column] = column
               end
-              definition.foreign_key(fk.to_table, fk.options)
+              to_table = strip_table_name_prefix_and_suffix(fk.to_table)
+              definition.foreign_key(to_table, fk.options)
             end
 
             yield definition if block_given?
diff --git a/activerecord/test/cases/migration/foreign_key_test.rb b/activerecord/test/cases/migration/foreign_key_test.rb
index bb233fbf74..8d152f2cf4 100644
--- a/activerecord/test/cases/migration/foreign_key_test.rb
+++ b/activerecord/test/cases/migration/foreign_key_test.rb
@@ -20,9 +20,7 @@ if ActiveRecord::Base.connection.supports_foreign_keys_in_create?
         end
       end
 
-      class ForeignKeyChangeColumnTest < ActiveRecord::TestCase
-        self.use_transactional_tests = false
-
+      module ForeignKeyChangeColumnSharedTest
         class Rocket < ActiveRecord::Base
           has_many :astronauts
         end
@@ -31,24 +29,39 @@ if ActiveRecord::Base.connection.supports_foreign_keys_in_create?
           belongs_to :rocket
         end
 
-        setup do
-          @connection = ActiveRecord::Base.connection
-          @connection.create_table "rockets", force: true do |t|
-            t.string :name
+        class CreateRocketsMigration < ActiveRecord::Migration::Current
+          def up
+            create_table :rockets do |t|
+              t.string :name
+            end
+
+            create_table :astronauts do |t|
+              t.string :name
+              t.references :rocket, foreign_key: true
+            end
           end
 
-          @connection.create_table "astronauts", force: true do |t|
-            t.string :name
-            t.references :rocket, foreign_key: true
+          def down
+            drop_table :astronauts, if_exists: true
+            drop_table :rockets, if_exists: true
           end
+        end
+
+        def setup
+          @connection = ActiveRecord::Base.connection
+          @migration = CreateRocketsMigration.new
+          silence_stream($stdout) { @migration.migrate(:up) }
+          Rocket.reset_table_name
           Rocket.reset_column_information
+          Astronaut.reset_table_name
           Astronaut.reset_column_information
         end
 
-        teardown do
-          @connection.drop_table "astronauts", if_exists: true
-          @connection.drop_table "rockets", if_exists: true
+        def teardown
+          silence_stream($stdout) { @migration.migrate(:down) }
+          Rocket.reset_table_name
           Rocket.reset_column_information
+          Astronaut.reset_table_name
           Astronaut.reset_column_information
         end
 
@@ -56,47 +69,90 @@ if ActiveRecord::Base.connection.supports_foreign_keys_in_create?
           rocket = Rocket.create!(name: "myrocket")
           rocket.astronauts << Astronaut.create!
 
-          @connection.change_column_null :rockets, :name, false
+          @connection.change_column_null Rocket.table_name, :name, false
 
-          foreign_keys = @connection.foreign_keys("astronauts")
+          foreign_keys = @connection.foreign_keys(Astronaut.table_name)
           assert_equal 1, foreign_keys.size
 
           fk = foreign_keys.first
           assert_equal "myrocket", Rocket.first.name
-          assert_equal "astronauts", fk.from_table
-          assert_equal "rockets", fk.to_table
+          assert_equal Astronaut.table_name, fk.from_table
+          assert_equal Rocket.table_name, fk.to_table
         end
 
         def test_rename_column_of_child_table
           rocket = Rocket.create!(name: "myrocket")
           rocket.astronauts << Astronaut.create!
 
-          @connection.rename_column :astronauts, :name, :astronaut_name
+          @connection.rename_column Astronaut.table_name, :name, :astronaut_name
 
-          foreign_keys = @connection.foreign_keys("astronauts")
+          foreign_keys = @connection.foreign_keys(Astronaut.table_name)
           assert_equal 1, foreign_keys.size
 
           fk = foreign_keys.first
           assert_equal "myrocket", Rocket.first.name
-          assert_equal "astronauts", fk.from_table
-          assert_equal "rockets", fk.to_table
+          assert_equal Astronaut.table_name, fk.from_table
+          assert_equal Rocket.table_name, fk.to_table
         end
 
         def test_rename_reference_column_of_child_table
           rocket = Rocket.create!(name: "myrocket")
           rocket.astronauts << Astronaut.create!
 
-          @connection.rename_column :astronauts, :rocket_id, :new_rocket_id
+          @connection.rename_column Astronaut.table_name, :rocket_id, :new_rocket_id
 
-          foreign_keys = @connection.foreign_keys("astronauts")
+          foreign_keys = @connection.foreign_keys(Astronaut.table_name)
           assert_equal 1, foreign_keys.size
 
           fk = foreign_keys.first
           assert_equal "myrocket", Rocket.first.name
-          assert_equal "astronauts", fk.from_table
-          assert_equal "rockets", fk.to_table
+          assert_equal Astronaut.table_name, fk.from_table
+          assert_equal Rocket.table_name, fk.to_table
           assert_equal "new_rocket_id", fk.options[:column]
         end
+
+        def test_remove_reference_column_of_child_table
+          rocket = Rocket.create!(name: "myrocket")
+          rocket.astronauts << Astronaut.create!
+
+          @connection.remove_column Astronaut.table_name, :rocket_id
+
+          assert_empty @connection.foreign_keys(Astronaut.table_name)
+        end
+      end
+
+      class ForeignKeyChangeColumnTest < ActiveRecord::TestCase
+        include ForeignKeyChangeColumnSharedTest
+
+        self.use_transactional_tests = false
+      end
+
+      class ForeignKeyChangeColumnWithPrefixTest < ActiveRecord::TestCase
+        include ForeignKeyChangeColumnSharedTest
+
+        self.use_transactional_tests = false
+
+        setup do
+          ActiveRecord::Base.table_name_prefix = "p_"
+        end
+
+        teardown do
+          ActiveRecord::Base.table_name_prefix = nil
+        end
+      end
+
+      class ForeignKeyChangeColumnWithSuffixTest < ActiveRecord::TestCase
+        include ForeignKeyChangeColumnSharedTest
+
+        self.use_transactional_tests = false
+
+        setup do
+          ActiveRecord::Base.table_name_suffix = "_p"
+        end
+
+        teardown do
+          ActiveRecord::Base.table_name_suffix = nil
+        end
       end
     end
   end