aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/postgresql
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2019-03-06 23:30:11 +0900
committerRyuta Kamizono <kamipo@gmail.com>2019-03-06 23:45:08 +0900
commitfd18b98dd90d738af265cf5b8f0d66ca11010132 (patch)
treeadaa5ffd1a5d3ef8fda9ec2945db1888ff7cfba5 /activerecord/lib/active_record/connection_adapters/postgresql
parentb366be3b5b28f01c8a55d67a5161ec36f53d555c (diff)
downloadrails-fd18b98dd90d738af265cf5b8f0d66ca11010132.tar.gz
rails-fd18b98dd90d738af265cf5b8f0d66ca11010132.tar.bz2
rails-fd18b98dd90d738af265cf5b8f0d66ca11010132.zip
Allow `remove_foreign_key` with both `to_table` and `options`
Foreign keys could be created to the same table. So `remove_foreign_key :from_table, :to_table` is sometimes ambiguous. This allows `remove_foreign_key` to remove the select one on the same table with giving both `to_table` and `options`.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/postgresql')
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
index d694a4f47d..a38c1325c0 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
@@ -623,10 +623,10 @@ module ActiveRecord
# validate_foreign_key :accounts, name: :special_fk_name
#
# The +options+ hash accepts the same keys as SchemaStatements#add_foreign_key.
- def validate_foreign_key(from_table, options_or_to_table = {})
+ def validate_foreign_key(from_table, to_table = nil, **options)
return unless supports_validate_constraints?
- fk_name_to_validate = foreign_key_for!(from_table, options_or_to_table).name
+ fk_name_to_validate = foreign_key_for!(from_table, to_table: to_table, **options).name
validate_constraint from_table, fk_name_to_validate
end