diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2019-01-18 22:58:54 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-18 22:58:54 +0900 |
| commit | ff3d1a42d5800c999be7351b72317cefb5961ee8 (patch) | |
| tree | aebed0f35655dd073c8d7e271c56726ef171d3fb /activerecord/lib/active_record/associations | |
| parent | 92cc996a09b7ffd5908c3c6771484fdf82e8729a (diff) | |
| parent | c196ca72a0dfbea5f1730f830ea20a9e02a3c737 (diff) | |
| download | rails-ff3d1a42d5800c999be7351b72317cefb5961ee8.tar.gz rails-ff3d1a42d5800c999be7351b72317cefb5961ee8.tar.bz2 rails-ff3d1a42d5800c999be7351b72317cefb5961ee8.zip | |
Merge pull request #30000 from kamipo/all_of_queries_should_return_correct_result
All of queries should return correct result even if including large number
Diffstat (limited to 'activerecord/lib/active_record/associations')
| -rw-r--r-- | activerecord/lib/active_record/associations/association.rb | 4 | ||||
| -rw-r--r-- | activerecord/lib/active_record/associations/singular_association.rb | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/associations/association.rb b/activerecord/lib/active_record/associations/association.rb index fb205d9ba5..5d0927f17d 100644 --- a/activerecord/lib/active_record/associations/association.rb +++ b/activerecord/lib/active_record/associations/association.rb @@ -190,9 +190,7 @@ module ActiveRecord end binds = AssociationScope.get_bind_values(owner, reflection.chain) - sc.execute(binds, conn) do |record| - set_inverse_instance(record) - end + sc.execute(binds, conn) { |record| set_inverse_instance(record) } || [] end # The scope for this association. diff --git a/activerecord/lib/active_record/associations/singular_association.rb b/activerecord/lib/active_record/associations/singular_association.rb index c296f9882e..a92932fa4b 100644 --- a/activerecord/lib/active_record/associations/singular_association.rb +++ b/activerecord/lib/active_record/associations/singular_association.rb @@ -37,8 +37,6 @@ module ActiveRecord def find_target super.first - rescue ::RangeError - nil end def replace(record) |