Merge pull request #33585 from yahonda/diag33520

SQLite3 adapter `alter_table` method restores foreign keys

3 files changed, 26 insertions, 1 deletions

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index cfd723cd5f..f6a6aa05a9 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   SQLite3 adapter `alter_table` method restores foreign keys.
+
+    *Yasuo Honda*
+
 *   Allow `:to_table` option to `invert_remove_foreign_key`.
 
     Example:
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
index bee74dc33d..38b1c31376 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
@@ -409,13 +409,14 @@ module ActiveRecord
 
         def alter_table(table_name, options = {})
           altered_table_name = "a#{table_name}"
+          options_to_restore = { foreign_keys: foreign_keys(table_name) }
           caller = lambda { |definition| yield definition if block_given? }
 
           transaction do
             disable_referential_integrity do
               move_table(table_name, altered_table_name,
                 options.merge(temporary: true))
-              move_table(altered_table_name, table_name, &caller)
+              move_table(altered_table_name, table_name, options_to_restore, &caller)
             end
           end
         end
@@ -446,6 +447,13 @@ module ActiveRecord
                 primary_key: column_name == from_primary_key
               )
             end
+
+            if options[:foreign_keys]
+              options[:foreign_keys].each do |fk|
+                @definition.foreign_key(fk.to_table, fk.options)
+              end
+            end
+
             yield @definition if block_given?
           end
           copy_table_indexes(from, to, options[:rename] || {})
diff --git a/activerecord/test/cases/migration/foreign_key_test.rb b/activerecord/test/cases/migration/foreign_key_test.rb
index c471dd1106..7b755787c7 100644
--- a/activerecord/test/cases/migration/foreign_key_test.rb
+++ b/activerecord/test/cases/migration/foreign_key_test.rb
@@ -64,6 +64,19 @@ if ActiveRecord::Base.connection.supports_foreign_keys_in_create?
           assert_equal "astronauts", fk.from_table
           assert_equal "rockets", 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
+
+          foreign_keys = @connection.foreign_keys("astronauts")
+          fk = foreign_keys.first
+          assert_equal "myrocket", Rocket.first.name
+          assert_equal "astronauts", fk.from_table
+          assert_equal "rockets", fk.to_table
+        end
       end
     end
   end