aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorYasuo Honda <yasuo.honda@gmail.com>2018-08-06 11:38:44 +0000
committerYasuo Honda <yasuo.honda@gmail.com>2018-08-11 14:49:45 +0000
commit33ce73edf1d1b02f4f50fc5d7565590468167d76 (patch)
treecf883b45f96fc0262052b53148c919526a1d2417 /activerecord
parent924f44371697c5fe1509a749e1187ad2c9257ab9 (diff)
downloadrails-33ce73edf1d1b02f4f50fc5d7565590468167d76.tar.gz
rails-33ce73edf1d1b02f4f50fc5d7565590468167d76.tar.bz2
rails-33ce73edf1d1b02f4f50fc5d7565590468167d76.zip
SQLite3 adapter `alter_table` method restores foreign keys
Related to #33520
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG.md4
-rw-r--r--activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb10
-rw-r--r--activerecord/test/cases/migration/foreign_key_test.rb13
3 files changed, 26 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index d1ae41ab97..db8f3b76c2 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,7 @@
+* SQLite3 adapter `alter_table` method restores foreign keys.
+
+ *Yasuo Honda*
+
* Add environment & load_config dependency to `bin/rake db:seed` to enable
seed load in environments without Rails and custom DB configuration
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..4b43f57732 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 = ActiveRecord::Base.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