aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorClifford T. Matthews <ctm@devctm.com>2016-02-23 15:20:54 -0700
committerClifford T. Matthews <ctm@devctm.com>2016-02-23 15:20:54 -0700
commit807e63b511c018228d9c1681adc02c9900f70631 (patch)
treec2f53b81bb84da6592f9331c5d5a436538021cb0 /activerecord
parent2c02bc0a47777ad8cf98e1465c08b1a68151803e (diff)
downloadrails-807e63b511c018228d9c1681adc02c9900f70631.tar.gz
rails-807e63b511c018228d9c1681adc02c9900f70631.tar.bz2
rails-807e63b511c018228d9c1681adc02c9900f70631.zip
Removes potentially quadratic Regexp from ActiveRecord::LogSubscriber#sql_color
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/log_subscriber.rb2
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