diff options
| author | Bart de Water <bartdewater@gmail.com> | 2018-07-28 17:37:17 -0400 |
|---|---|---|
| committer | Bart de Water <bartdewater@gmail.com> | 2018-07-28 17:37:17 -0400 |
| commit | eb5fea40a404e829f00552859ae1b206728d99d7 (patch) | |
| tree | 3abe3c813b8e64c5bb009902166953a616786232 /activerecord | |
| parent | 8741052ba25722283ea057f6f022f16b1931ce3e (diff) | |
| download | rails-eb5fea40a404e829f00552859ae1b206728d99d7.tar.gz rails-eb5fea40a404e829f00552859ae1b206728d99d7.tar.bz2 rails-eb5fea40a404e829f00552859ae1b206728d99d7.zip | |
Enable Start/EndWith and RegexpMatch cops
In cases where the MatchData object is not used, this provides a speed-up:
https://github.com/JuanitoFatas/fast-ruby/#stringmatch-vs-stringmatch-vs-stringstart_withstringend_with-code-start-code-end
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_adapter.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/relation/calculations.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb index 8bdf1712b1..baf33e2d37 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb @@ -81,7 +81,7 @@ module ActiveRecord alias :in_use? :owner def self.type_cast_config_to_integer(config) - if config =~ SIMPLE_INT + if SIMPLE_INT.match?(config) config.to_i else config diff --git a/activerecord/lib/active_record/relation/calculations.rb b/activerecord/lib/active_record/relation/calculations.rb index f215c95f51..3c45462f46 100644 --- a/activerecord/lib/active_record/relation/calculations.rb +++ b/activerecord/lib/active_record/relation/calculations.rb @@ -245,7 +245,7 @@ module ActiveRecord if distinct && (group_values.any? || select_values.empty? && order_values.empty?) column_name = primary_key end - elsif column_name =~ /\s*DISTINCT[\s(]+/i + elsif /\s*DISTINCT[\s(]+/i.match?(column_name) distinct = nil end end |