diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-04-09 16:20:52 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-04-09 16:20:52 -0700 |
| commit | c954a74ee280b99dd6e9aa1e9698cdee76d56214 (patch) | |
| tree | dfb8d9d8baa55e59026b23657137ddc857b832ef /activerecord | |
| parent | 89e569df00e5ee9dba9f1aa20c846cb8f3152811 (diff) | |
| parent | c7d009b35e2b6b35352eaeba6290b67e8afffdb1 (diff) | |
| download | rails-c954a74ee280b99dd6e9aa1e9698cdee76d56214.tar.gz rails-c954a74ee280b99dd6e9aa1e9698cdee76d56214.tar.bz2 rails-c954a74ee280b99dd6e9aa1e9698cdee76d56214.zip | |
Merge branch 'master' into adequaterecord
* master:
add services: memcache to travis
The `source` option for `has_many => through` should accept String values.
Diffstat (limited to 'activerecord')
| -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 |