diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-02 07:00:56 -0800 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-02 07:00:56 -0800 |
| commit | 1fd7971af77590979af2b1a894f7ad8e64df009e (patch) | |
| tree | 1fda69649f6e7262a76e398d66bae1aa0dd5ed54 /activerecord | |
| parent | fb61a80eae9f83d70c10d558e3047377e560320c (diff) | |
| parent | 0a9172f1908d26d013a851b8be6fe785c596b74f (diff) | |
| download | rails-1fd7971af77590979af2b1a894f7ad8e64df009e.tar.gz rails-1fd7971af77590979af2b1a894f7ad8e64df009e.tar.bz2 rails-1fd7971af77590979af2b1a894f7ad8e64df009e.zip | |
Merge pull request #8691 from acapilleri/preload_association
refactoring to_sym of Symbol in preload
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/associations/preloader.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/preloader.rb b/activerecord/lib/active_record/associations/preloader.rb index 0848e7afb3..82bf426b22 100644 --- a/activerecord/lib/active_record/associations/preloader.rb +++ b/activerecord/lib/active_record/associations/preloader.rb @@ -100,7 +100,9 @@ module ActiveRecord case association when Hash preload_hash(association) - when String, Symbol + when Symbol + preload_one(association) + when String preload_one(association.to_sym) else raise ArgumentError, "#{association.inspect} was not recognised for preload" |