diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-12-11 03:14:46 +1030 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-11 03:14:46 +1030 |
| commit | 2affe7067f2fde839a66aab852a3d166bbd98a02 (patch) | |
| tree | 24c3ac5f77995a7fc682ec034804978c97e1421f | |
| parent | 753da21322a2701f8b2294da1c26df8a783436d5 (diff) | |
| parent | 3f7cd2c57151f9873f6e2a06dd020447fd7e360a (diff) | |
| download | rails-2affe7067f2fde839a66aab852a3d166bbd98a02.tar.gz rails-2affe7067f2fde839a66aab852a3d166bbd98a02.tar.bz2 rails-2affe7067f2fde839a66aab852a3d166bbd98a02.zip | |
Merge pull request #27322 from kamipo/fix_ci_failure
Fix CI failure caused by #25227 and #25280 were merged at the same time
| -rw-r--r-- | activerecord/lib/active_record/associations/singular_association.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/associations/belongs_to_associations_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/singular_association.rb b/activerecord/lib/active_record/associations/singular_association.rb index 6d69f757eb..ee7b7c8bea 100644 --- a/activerecord/lib/active_record/associations/singular_association.rb +++ b/activerecord/lib/active_record/associations/singular_association.rb @@ -58,7 +58,7 @@ module ActiveRecord sc.execute(binds, klass, conn) do |record| set_inverse_instance record end.first - rescue RangeError + rescue ::RangeError nil end diff --git a/activerecord/test/cases/associations/belongs_to_associations_test.rb b/activerecord/test/cases/associations/belongs_to_associations_test.rb index 2b8d01743f..81a2a161f2 100644 --- a/activerecord/test/cases/associations/belongs_to_associations_test.rb +++ b/activerecord/test/cases/associations/belongs_to_associations_test.rb @@ -1079,7 +1079,7 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase end comment = model.new - comment.post_id = 10_000_000_000 + comment.post_id = 9223372036854775808 # out of range in the bigint assert_nil comment.post assert_not comment.valid? |