diff options
| author | utilum <oz@utilum.com> | 2019-02-01 00:46:11 +0100 |
|---|---|---|
| committer | utilum <oz@utilum.com> | 2019-02-13 02:11:21 +0100 |
| commit | 87a5379b422d38ea8766af1537593af44b6dffc6 (patch) | |
| tree | f77e757600a1ef91ab5a21cfa955036ece8c1fb6 /activerecord/lib/active_record/statement_cache.rb | |
| parent | 8d9d46fdae4502b8881eca641c51a64ee7804194 (diff) | |
| download | rails-87a5379b422d38ea8766af1537593af44b6dffc6.tar.gz rails-87a5379b422d38ea8766af1537593af44b6dffc6.tar.bz2 rails-87a5379b422d38ea8766af1537593af44b6dffc6.zip | |
Ruby 2.7 warning: creating a Proc without a block
As of [Revision 66772](
https://bugs.ruby-lang.org/projects/ruby-trunk/repository/trunk/revisions/66772)
`Proc.new` without giving a block emits `warning: tried to create Proc object without a block`.
This commit fixes cases where Rails test suit tickles this warning.
See CI logs:
https://travis-ci.org/rails/rails/jobs/487205819#L1161-L1190
https://travis-ci.org/rails/rails/jobs/487205821#L1154-1159
https://travis-ci.org/rails/rails/jobs/487205821#L1160-L1169
https://travis-ci.org/rails/rails/jobs/487205821#L1189
https://travis-ci.org/rails/rails/jobs/487254404#L1307-L1416
https://travis-ci.org/rails/rails/jobs/487254405#L1174-L1191
Diffstat (limited to 'activerecord/lib/active_record/statement_cache.rb')
| -rw-r--r-- | activerecord/lib/active_record/statement_cache.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/statement_cache.rb b/activerecord/lib/active_record/statement_cache.rb index 95984e7ada..93bce15230 100644 --- a/activerecord/lib/active_record/statement_cache.rb +++ b/activerecord/lib/active_record/statement_cache.rb @@ -113,8 +113,8 @@ module ActiveRecord end end - def self.create(connection, block = Proc.new) - relation = block.call Params.new + def self.create(connection, callable = nil, &block) + relation = (callable || block).call Params.new query_builder, binds = connection.cacheable_query(self, relation.arel) bind_map = BindMap.new(binds) new(query_builder, bind_map, relation.klass) |