aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/reflection.rb
diff options
context:
space:
mode:
authorLauro Caetano <laurocaetano1@gmail.com>2014-04-09 21:25:39 -0300
committerLauro Caetano <laurocaetano1@gmail.com>2014-04-09 21:25:39 -0300
commit4c6ba7432dc5288708817d5b03e7ed13458ca58d (patch)
treefb337e76d59aa6f95a3b8bdde164ad29ad35e870 /activerecord/lib/active_record/reflection.rb
parent1f31488499111fdfce79d8dc1cc8fb008f7cdb25 (diff)
downloadrails-4c6ba7432dc5288708817d5b03e7ed13458ca58d.tar.gz
rails-4c6ba7432dc5288708817d5b03e7ed13458ca58d.tar.bz2
rails-4c6ba7432dc5288708817d5b03e7ed13458ca58d.zip
No need to call `to_sym` on reflection name, since the cache now works
with strings with string keys. Related #14668.
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 9e4c70dabf..eddc0cf51c 100644
--- a/activerecord/lib/active_record/reflection.rb
+++ b/activerecord/lib/active_record/reflection.rb
@@ -617,11 +617,11 @@ module ActiveRecord
# # => [:tag, :tags]
#
def source_reflection_names
- (options[:source] ? [options[:source]] : [name.to_s.singularize, name]).collect { |n| n.to_sym }.uniq
+ (options[:source] ? [options[:source]] : [name.to_s.singularize, name]).collect { |n| n }.uniq
end
def source_reflection_name # :nodoc:
- return @source_reflection_name.to_sym if @source_reflection_name
+ return @source_reflection_name if @source_reflection_name
names = [name.to_s.singularize, name].collect { |n| n.to_sym }.uniq
names = names.find_all { |n|