From c196ca72a0dfbea5f1730f830ea20a9e02a3c737 Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Fri, 21 Jul 2017 12:26:09 +0900 Subject: Ensure `StatementCache#execute` never raises `RangeError` Since 31ffbf8d, finder methods no longer raise `RangeError`. So `StatementCache#execute` is the only place to raise the exception for finder queries. `StatementCache` is used for simple equality queries in the codebase. This means that if `StatementCache#execute` raises `RangeError`, the result could always be regarded as empty. So `StatementCache#execute` just return nil in that range error case, and treat that as empty in the caller side, then we can avoid catching the exception in much places. --- activerecord/lib/active_record/statement_cache.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'activerecord/lib/active_record/statement_cache.rb') diff --git a/activerecord/lib/active_record/statement_cache.rb b/activerecord/lib/active_record/statement_cache.rb index 1b1736dcab..95984e7ada 100644 --- a/activerecord/lib/active_record/statement_cache.rb +++ b/activerecord/lib/active_record/statement_cache.rb @@ -132,6 +132,8 @@ module ActiveRecord sql = query_builder.sql_for bind_values, connection klass.find_by_sql(sql, bind_values, preparable: true, &block) + rescue ::RangeError + nil end def self.unsupported_value?(value) -- cgit v1.2.3