diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-02-29 15:30:31 -0300 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2016-02-29 15:30:31 -0300 |
| commit | ee4a1462e97f26bd480352468efab5b9c18aa8de (patch) | |
| tree | d420b8804addc71478ed874933bbf9afe71d886a | |
| parent | 67aa8f194331d7b19b47eb80b71bff027df8684f (diff) | |
| parent | 807e63b511c018228d9c1681adc02c9900f70631 (diff) | |
| download | rails-ee4a1462e97f26bd480352468efab5b9c18aa8de.tar.gz rails-ee4a1462e97f26bd480352468efab5b9c18aa8de.tar.bz2 rails-ee4a1462e97f26bd480352468efab5b9c18aa8de.zip | |
Merge pull request #23948 from ctm/remove_pathological_regexp
Removes potentially quadratic Regexp from ActiveRecord::LogSubscriber…
| -rw-r--r-- | activerecord/lib/active_record/log_subscriber.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/log_subscriber.rb b/activerecord/lib/active_record/log_subscriber.rb index b63caa4473..efa2a4df02 100644 --- a/activerecord/lib/active_record/log_subscriber.rb +++ b/activerecord/lib/active_record/log_subscriber.rb @@ -67,7 +67,7 @@ module ActiveRecord case sql when /\A\s*rollback/mi RED - when /\s*.*?select .*for update/mi, /\A\s*lock/mi + when /select .*for update/mi, /\A\s*lock/mi WHITE when /\A\s*select/i BLUE |