diff options
| author | Tyler Distad <tyler.distad@gmail.com> | 2016-05-16 19:24:55 -0400 |
|---|---|---|
| committer | Tyler Distad <tyler.distad@gmail.com> | 2016-05-16 19:31:58 -0400 |
| commit | 82bb0084b4c0de231a374ce9ca7c70391e9aa6e6 (patch) | |
| tree | ce561b849c2237f7cfadf5f343cd7978c5c4acff /activerecord/lib/active_record/associations/association.rb | |
| parent | f85bbed4cdc1bdfd1e0dbd97bce9db81e44cbd11 (diff) | |
| download | rails-82bb0084b4c0de231a374ce9ca7c70391e9aa6e6.tar.gz rails-82bb0084b4c0de231a374ce9ca7c70391e9aa6e6.tar.bz2 rails-82bb0084b4c0de231a374ce9ca7c70391e9aa6e6.zip | |
Associations do not call `.to_proc` on Hash
Fixes #25010
Diffstat (limited to 'activerecord/lib/active_record/associations/association.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/association.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/association.rb b/activerecord/lib/active_record/associations/association.rb index 99f307922e..abee941c07 100644 --- a/activerecord/lib/active_record/associations/association.rb +++ b/activerecord/lib/active_record/associations/association.rb @@ -158,7 +158,7 @@ module ActiveRecord end def interpolate(sql, record = nil) - if sql.respond_to?(:to_proc) + if sql.respond_to?(:to_proc) && !sql.is_a?(Hash) owner.send(:instance_exec, record, &sql) else sql |