diff options
| author | George Claghorn <george.claghorn@gmail.com> | 2018-08-14 21:27:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-14 21:27:44 -0400 |
| commit | e715a64732f7b2f82aa809e59cfee83f892795f1 (patch) | |
| tree | b3f0749ed8a998284bbc4d2b22324d41c703c6ee | |
| parent | d54435b6bc3d6a2d679ca3cdd9a2a20ea2887893 (diff) | |
| parent | 50ac00cb73ff189794b5004085b76c81e131df6e (diff) | |
| download | rails-e715a64732f7b2f82aa809e59cfee83f892795f1.tar.gz rails-e715a64732f7b2f82aa809e59cfee83f892795f1.tar.bz2 rails-e715a64732f7b2f82aa809e59cfee83f892795f1.zip | |
Merge pull request #33617 from bogdanvlviv/follow-up-33530
Follow up #33530
| -rw-r--r-- | activerecord/CHANGELOG.md | 12 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb | 6 | ||||
| -rw-r--r-- | activerecord/test/cases/migration/command_recorder_test.rb | 5 |
3 files changed, 16 insertions, 7 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 06ce2e6d4f..cfd723cd5f 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,11 @@ +* Allow `:to_table` option to `invert_remove_foreign_key`. + + Example: + + remove_foreign_key :accounts, to_table: :owners + + *Nikolay Epifanov*, *Rich Chen* + * Add environment & load_config dependency to `bin/rake db:seed` to enable seed load in environments without Rails and custom DB configuration @@ -73,9 +81,5 @@ *DHH* -* Allow `to_table` in `invert_remove_foreign_key`. - - *Nikolay Epifanov*, *Rich Chen* - Please check [5-2-stable](https://github.com/rails/rails/blob/5-2-stable/activerecord/CHANGELOG.md) for previous changes. 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 fd9bf48ab5..4702de1964 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb @@ -980,9 +980,9 @@ module ActiveRecord # # remove_foreign_key :accounts, column: :owner_id # - # Removes the foreign key on +accounts.owner_id+. in a reversible manner + # Removes the foreign key on +accounts.owner_id+. # - # remove_foreign_key :accounts, column: :owner_id, to_table: :owners + # remove_foreign_key :accounts, to_table: :owners # # Removes the foreign key named +special_fk_name+ on the +accounts+ table. # @@ -991,7 +991,7 @@ module ActiveRecord # The +options+ hash accepts the same keys as SchemaStatements#add_foreign_key # with an addition of # [<tt>:to_table</tt>] - # The table contains the referenced primary key. + # The name of the table that contains the referenced primary key. def remove_foreign_key(from_table, options_or_to_table = {}) return unless supports_foreign_keys? diff --git a/activerecord/test/cases/migration/command_recorder_test.rb b/activerecord/test/cases/migration/command_recorder_test.rb index daca296ade..1a19b8dafd 100644 --- a/activerecord/test/cases/migration/command_recorder_test.rb +++ b/activerecord/test/cases/migration/command_recorder_test.rb @@ -329,6 +329,11 @@ module ActiveRecord assert_equal [:add_foreign_key, [:dogs, :people, primary_key: "person_id"]], enable end + def test_invert_remove_foreign_key_with_primary_key_and_to_table_in_options + enable = @recorder.inverse_of :remove_foreign_key, [:dogs, to_table: :people, primary_key: "uuid"] + assert_equal [:add_foreign_key, [:dogs, :people, primary_key: "uuid"]], enable + end + def test_invert_remove_foreign_key_with_on_delete_on_update enable = @recorder.inverse_of :remove_foreign_key, [:dogs, :people, on_delete: :nullify, on_update: :cascade] assert_equal [:add_foreign_key, [:dogs, :people, on_delete: :nullify, on_update: :cascade]], enable |