diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-04-09 11:15:12 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-04-09 11:15:12 -0700 |
| commit | 1368311eecaac0594f683de3d86507c098a34e5a (patch) | |
| tree | d7b151680d6533259e8bc6dfc2e25a2f732fcd66 | |
| parent | 7b75b678cf11a1aed7927a9db42fb60a38726450 (diff) | |
| parent | a91e5ff2cbf2f8971ad0d2a80b2e22e63b1900f6 (diff) | |
| download | rails-1368311eecaac0594f683de3d86507c098a34e5a.tar.gz rails-1368311eecaac0594f683de3d86507c098a34e5a.tar.bz2 rails-1368311eecaac0594f683de3d86507c098a34e5a.zip | |
Merge pull request #14668 from laurocaetano/source_option_with_string_value
The :source option for has_many => through should accept String values.
| -rw-r--r-- | activerecord/lib/active_record/reflection.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/models/tag.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb index 03b5bdc46c..5465a7bfd7 100644 --- a/activerecord/lib/active_record/reflection.rb +++ b/activerecord/lib/active_record/reflection.rb @@ -621,7 +621,7 @@ module ActiveRecord end def source_reflection_name # :nodoc: - return @source_reflection_name if @source_reflection_name + return @source_reflection_name.to_sym if @source_reflection_name names = [name.to_s.singularize, name].collect { |n| n.to_sym }.uniq names = names.find_all { |n| diff --git a/activerecord/test/models/tag.rb b/activerecord/test/models/tag.rb index a581b381e8..80d4725f7e 100644 --- a/activerecord/test/models/tag.rb +++ b/activerecord/test/models/tag.rb @@ -3,5 +3,5 @@ class Tag < ActiveRecord::Base has_many :taggables, :through => :taggings has_one :tagging - has_many :tagged_posts, :through => :taggings, :source => :taggable, :source_type => 'Post' -end
\ No newline at end of file + has_many :tagged_posts, :through => :taggings, :source => 'taggable', :source_type => 'Post' +end |