aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/reflection.rb
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2017-12-31 22:05:23 +0900
committerRyuta Kamizono <kamipo@gmail.com>2018-01-01 04:31:23 +0900
commit2955ee4198a17c94e0b3429200c7b171820eef25 (patch)
tree6ed39f0b9c3988740327c155f5ff40e219495506 /activerecord/lib/active_record/reflection.rb
parent15b3275a291d3d9bdf4db3f054b2283788396af3 (diff)
downloadrails-2955ee4198a17c94e0b3429200c7b171820eef25.tar.gz
rails-2955ee4198a17c94e0b3429200c7b171820eef25.tar.bz2
rails-2955ee4198a17c94e0b3429200c7b171820eef25.zip
Refactor delegating `join_primary_key` instead of `join_keys` and `association_primary_key` in `TableMetadata`
Because `join_primary_key` is called by `join_keys` and it is to abstract calling `association_primary_key`.
Diffstat (limited to 'activerecord/lib/active_record/reflection.rb')
-rw-r--r--activerecord/lib/active_record/reflection.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb
index 87bfd75bca..e45228a2ec 100644
--- a/activerecord/lib/active_record/reflection.rb
+++ b/activerecord/lib/active_record/reflection.rb
@@ -293,7 +293,7 @@ module ActiveRecord
Relation.create(klass, table, predicate_builder)
end
- def join_primary_key(_)
+ def join_primary_key(*)
foreign_key
end
@@ -722,7 +722,7 @@ module ActiveRecord
end
end
- def join_primary_key(klass)
+ def join_primary_key(klass = nil)
polymorphic? ? association_primary_key(klass) : association_primary_key
end