systematic revision of =~ usage in AR

Where appropriatei, prefer the more concise Regexp#match?,
String#include?, String#start_with?, or String#end_with?

21 files changed, 34 insertions, 29 deletions

diff --git a/activerecord/Rakefile b/activerecord/Rakefile
index 012db35765..8fbea61335 100644
--- a/activerecord/Rakefile
+++ b/activerecord/Rakefile
@@ -51,7 +51,7 @@ end
       adapter_short = adapter == 'db2' ? adapter : adapter[/^[a-z0-9]+/]
       t.libs << 'test'
       t.test_files = (Dir.glob( "test/cases/**/*_test.rb" ).reject {
-        |x| x =~ /\/adapters\//
+        |x| x.include?('/adapters/')
       } + Dir.glob("test/cases/adapters/#{adapter_short}/**/*_test.rb"))
 
       t.warning = true
@@ -64,7 +64,7 @@ end
         adapter_short = adapter == 'db2' ? adapter : adapter[/^[a-z0-9]+/]
         puts [adapter, adapter_short].inspect
         (Dir["test/cases/**/*_test.rb"].reject {
-          |x| x =~ /\/adapters\//
+          |x| x.include?('/adapters/')
         } + Dir["test/cases/adapters/#{adapter_short}/**/*_test.rb"]).all? do |file|
           sh(Gem.ruby, '-w' ,"-Itest", file)
         end or raise "Failures"
diff --git a/activerecord/lib/active_record/coders/yaml_column.rb b/activerecord/lib/active_record/coders/yaml_column.rb
index 2456b8ad8c..606abb7e24 100644
--- a/activerecord/lib/active_record/coders/yaml_column.rb
+++ b/activerecord/lib/active_record/coders/yaml_column.rb
@@ -20,7 +20,7 @@ module ActiveRecord
 
       def load(yaml)
         return object_class.new if object_class != Object && yaml.nil?
-        return yaml unless yaml.is_a?(String) && yaml =~ /^---/
+        return yaml unless yaml.is_a?(String) && /^---/.match?(yaml)
         obj = YAML.load(yaml)
 
         assert_valid_value(obj)
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
index 3e77b92141..0a98a8e9c1 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -85,7 +85,7 @@ module ActiveRecord
       end
 
       def mariadb? # :nodoc:
-        full_version =~ /mariadb/i
+        /mariadb/i.match?(full_version)
       end
 
       # Returns true, since this connection adapter supports migrations.
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb b/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb
index 6414459cd1..80c219dfd7 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb
@@ -58,7 +58,7 @@ module ActiveRecord
         def quote_default_expression(value, column) # :nodoc:
           if value.is_a?(Proc)
             value.call
-          elsif column.type == :uuid && value =~ /\(\)/
+          elsif column.type == :uuid && value.include?('()')
             value # Does not quote function default values for UUID columns
           elsif column.respond_to?(:array?)
             value = type_cast_from_column(column, value)
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
index 7e23f44ddf..ed6bff4665 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
@@ -548,7 +548,7 @@ module ActiveRecord
             columns_string.split(',').each do |column_string|
               # This regex will match the column name and collation type and will save
               # the value in $1 and $2 respectively.
-              collation_hash[$1] = $2 if (COLLATE_REGEX =~ column_string)
+              collation_hash[$1] = $2 if COLLATE_REGEX =~ column_string
             end
 
             basic_structure.map! do |column|
diff --git a/activerecord/lib/active_record/dynamic_matchers.rb b/activerecord/lib/active_record/dynamic_matchers.rb
index b6dd6814db..88cb66d977 100644
--- a/activerecord/lib/active_record/dynamic_matchers.rb
+++ b/activerecord/lib/active_record/dynamic_matchers.rb
@@ -29,7 +29,7 @@ module ActiveRecord
         attr_reader :matchers
 
         def match(model, name)
-          klass = matchers.find { |k| name =~ k.pattern }
+          klass = matchers.find { |k| k.pattern.match?(name) }
           klass.new(model, name) if klass
         end
 
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb
index fb2a23b797..1ad209cbbf 100644
--- a/activerecord/lib/active_record/migration.rb
+++ b/activerecord/lib/active_record/migration.rb
@@ -1057,7 +1057,7 @@ module ActiveRecord
       end
 
       def match_to_migration_filename?(filename) # :nodoc:
-        File.basename(filename) =~ Migration::MigrationFilenameRegexp
+        Migration::MigrationFilenameRegexp.match?(File.basename(filename))
       end
 
       def parse_migration_filename(filename) # :nodoc:
diff --git a/activerecord/lib/active_record/model_schema.rb b/activerecord/lib/active_record/model_schema.rb
index 114686c5d3..99facb4b25 100644
--- a/activerecord/lib/active_record/model_schema.rb
+++ b/activerecord/lib/active_record/model_schema.rb
@@ -309,7 +309,12 @@ module ActiveRecord
       # Returns an array of column objects where the primary id, all columns ending in "_id" or "_count",
       # and columns used for single table inheritance have been removed.
       def content_columns
-        @content_columns ||= columns.reject { |c| c.name == primary_key || c.name =~ /(_id|_count)$/ || c.name == inheritance_column }
+        @content_columns ||= columns.reject do |c|
+          c.name == primary_key ||
+          c.name == inheritance_column ||
+          c.name.end_with?('_id') ||
+          c.name.end_with?('_count')
+        end
       end
 
       # Resets all the cached information about columns, which will cause them
diff --git a/activerecord/lib/active_record/relation/delegation.rb b/activerecord/lib/active_record/relation/delegation.rb
index 2484cb3264..13f80270a4 100644
--- a/activerecord/lib/active_record/relation/delegation.rb
+++ b/activerecord/lib/active_record/relation/delegation.rb
@@ -58,7 +58,7 @@ module ActiveRecord
           @delegation_mutex.synchronize do
             return if method_defined?(method)
 
-            if method.to_s =~ /\A[a-zA-Z_]\w*[!?]?\z/
+            if /\A[a-zA-Z_]\w*[!?]?\z/.match?(method)
               module_eval <<-RUBY, __FILE__, __LINE__ + 1
                 def #{method}(*args, &block)
                   scoping { @klass.#{method}(*args, &block) }
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index 8a87015e44..62821cacc9 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -1135,10 +1135,10 @@ module ActiveRecord
     end
 
     def does_not_support_reverse?(order)
-      #uses sql function with multiple arguments
-      order =~ /\([^()]*,[^()]*\)/ ||
-        # uses "nulls first" like construction
-        order =~ /nulls (first|last)\Z/i
+      # Uses SQL function with multiple arguments.
+      /\([^()]*,[^()]*\)/.match?(order)  ||
+      # Uses "nulls first" like construction.
+      /nulls (first|last)\Z/i.match?(order)
     end
 
     def build_order(arel)
diff --git a/activerecord/lib/active_record/sanitization.rb b/activerecord/lib/active_record/sanitization.rb
index a9e1fd0dad..6ecb9ce3a7 100644
--- a/activerecord/lib/active_record/sanitization.rb
+++ b/activerecord/lib/active_record/sanitization.rb
@@ -153,7 +153,7 @@ module ActiveRecord
       #   # => "name='foo''bar' and group_id='4'"
       def sanitize_sql_array(ary)
         statement, *values = ary
-        if values.first.is_a?(Hash) && statement =~ /:\w+/
+        if values.first.is_a?(Hash) && /:\w+/.match?(statement)
           replace_named_bind_variables(statement, values.first)
         elsif statement.include?('?')
           replace_bind_variables(statement, values)
diff --git a/activerecord/lib/active_record/tasks/mysql_database_tasks.rb b/activerecord/lib/active_record/tasks/mysql_database_tasks.rb
index b1a0ad0115..8574807fd2 100644
--- a/activerecord/lib/active_record/tasks/mysql_database_tasks.rb
+++ b/activerecord/lib/active_record/tasks/mysql_database_tasks.rb
@@ -90,7 +90,7 @@ module ActiveRecord
       end
 
       def error_class
-        if configuration['adapter'] =~ /jdbc/
+        if configuration['adapter'].include?('jdbc')
           require 'active_record/railties/jdbcmysql_error'
           ArJdbcMySQL::Error
         elsif defined?(Mysql2)
diff --git a/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb b/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb
index 4e5872b585..54c958e30b 100644
--- a/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb
+++ b/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb
@@ -60,7 +60,7 @@ module ActiveRecord
         # A migration file name can only contain underscores (_), lowercase characters,
         # and numbers 0-9. Any other file name will raise an IllegalMigrationNameError.
         def validate_file_name!
-          unless file_name =~ /^[_a-z0-9]+$/
+          unless /^[_a-z0-9]+$/.match?(file_name)
             raise IllegalMigrationNameError.new(file_name)
           end
         end
diff --git a/activerecord/test/cases/associations/inner_join_association_test.rb b/activerecord/test/cases/associations/inner_join_association_test.rb
index b3fe759ad9..a2158e4f3b 100644
--- a/activerecord/test/cases/associations/inner_join_association_test.rb
+++ b/activerecord/test/cases/associations/inner_join_association_test.rb
@@ -86,7 +86,7 @@ class InnerJoinAssociationTest < ActiveRecord::TestCase
   end
 
   def test_calculate_honors_implicit_inner_joins_and_distinct_and_conditions
-    real_count = Author.all.to_a.select {|a| a.posts.any? {|p| p.title =~ /^Welcome/} }.length
+    real_count = Author.all.to_a.select {|a| a.posts.any? {|p| p.title.start_with?('Welcome')} }.length
     authors_with_welcoming_post_titles = Author.all.merge!(joins: :posts, where: "posts.title like 'Welcome%'").distinct.calculate(:count, 'authors.id')
     assert_equal real_count, authors_with_welcoming_post_titles, "inner join and conditions should have only returned authors posting titles starting with 'Welcome'"
   end
diff --git a/activerecord/test/cases/associations/left_outer_join_association_test.rb b/activerecord/test/cases/associations/left_outer_join_association_test.rb
index eee135cfb8..fcf1e0b040 100644
--- a/activerecord/test/cases/associations/left_outer_join_association_test.rb
+++ b/activerecord/test/cases/associations/left_outer_join_association_test.rb
@@ -20,7 +20,7 @@ class LeftOuterJoinAssociationTest < ActiveRecord::TestCase
         Person.left_outer_joins(:agents => {:agents => :agents})
               .left_outer_joins(:agents => {:agents => {:primary_contact => :agents}}).to_a
       end
-      assert queries.any? { |sql| /agents_people_4/i =~ sql }
+      assert queries.any? { |sql| /agents_people_4/i.match?(sql) }
     end
   end
 
@@ -36,12 +36,12 @@ class LeftOuterJoinAssociationTest < ActiveRecord::TestCase
 
   def test_construct_finder_sql_ignores_empty_left_outer_joins_hash
     queries = capture_sql { Author.left_outer_joins({}) }
-    assert queries.none? { |sql| /LEFT OUTER JOIN/i =~ sql }
+    assert queries.none? { |sql| /LEFT OUTER JOIN/i.match?(sql) }
   end
 
   def test_construct_finder_sql_ignores_empty_left_outer_joins_array
     queries = capture_sql { Author.left_outer_joins([]) }
-    assert queries.none? { |sql| /LEFT OUTER JOIN/i =~ sql }
+    assert queries.none? { |sql| /LEFT OUTER JOIN/i.match?(sql) }
   end
 
   def test_left_outer_joins_forbids_to_use_string_as_argument
@@ -50,8 +50,8 @@ class LeftOuterJoinAssociationTest < ActiveRecord::TestCase
 
   def test_join_conditions_added_to_join_clause
     queries = capture_sql { Author.left_outer_joins(:essays).to_a }
-    assert queries.any? { |sql| /writer_type.*?=.*?(Author|\?|\$1|\:a1)/i =~ sql }
-    assert queries.none? { |sql| /WHERE/i =~ sql }
+    assert queries.any? { |sql| /writer_type.*?=.*?(Author|\?|\$1|\:a1)/i.match?(sql) }
+    assert queries.none? { |sql| /WHERE/i.match?(sql) }
   end
 
   def test_find_with_sti_join
diff --git a/activerecord/test/cases/attribute_methods_test.rb b/activerecord/test/cases/attribute_methods_test.rb
index 04126e87e4..706f8767a9 100644
--- a/activerecord/test/cases/attribute_methods_test.rb
+++ b/activerecord/test/cases/attribute_methods_test.rb
@@ -197,7 +197,7 @@ class AttributeMethodsTest < ActiveRecord::TestCase
   if current_adapter?(:Mysql2Adapter)
     def test_read_attributes_before_type_cast_on_boolean
       bool = Boolean.create!({ "value" => false })
-      if RUBY_PLATFORM =~ /java/
+      if RUBY_PLATFORM.include?('java')
         # JRuby will return the value before typecast as string
         assert_equal "0", bool.reload.attributes_before_type_cast["value"]
       else
diff --git a/activerecord/test/cases/callbacks_test.rb b/activerecord/test/cases/callbacks_test.rb
index 4f70ae3a1d..8a722b4f22 100644
--- a/activerecord/test/cases/callbacks_test.rb
+++ b/activerecord/test/cases/callbacks_test.rb
@@ -31,7 +31,7 @@ class CallbackDeveloper < ActiveRecord::Base
   end
 
   ActiveRecord::Callbacks::CALLBACKS.each do |callback_method|
-    next if callback_method.to_s =~ /^around_/
+    next if callback_method.to_s.start_with?('around_')
     define_callback_method(callback_method)
     ActiveSupport::Deprecation.silence { send(callback_method, callback_string(callback_method)) }
     send(callback_method, callback_proc(callback_method))
diff --git a/activerecord/test/cases/dirty_test.rb b/activerecord/test/cases/dirty_test.rb
index f9794518c7..3c58b6ad09 100644
--- a/activerecord/test/cases/dirty_test.rb
+++ b/activerecord/test/cases/dirty_test.rb
@@ -604,7 +604,7 @@ class DirtyTest < ActiveRecord::TestCase
         jon = Person.create! first_name: 'Jon'
       end
 
-      assert ActiveRecord::SQLCounter.log_all.none? { |sql| sql =~ /followers_count/ }
+      assert ActiveRecord::SQLCounter.log_all.none? { |sql| sql.include?('followers_count') }
 
       jon.reload
       assert_equal 'Jon', jon.first_name
diff --git a/activerecord/test/cases/scoping/default_scoping_test.rb b/activerecord/test/cases/scoping/default_scoping_test.rb
index dcd09b6973..30d342ac70 100644
--- a/activerecord/test/cases/scoping/default_scoping_test.rb
+++ b/activerecord/test/cases/scoping/default_scoping_test.rb
@@ -201,7 +201,7 @@ class DefaultScopingTest < ActiveRecord::TestCase
 
   def test_order_to_unscope_reordering
     scope = DeveloperOrderedBySalary.order('salary DESC, name ASC').reverse_order.unscope(:order)
-    assert !(scope.to_sql =~ /order/i)
+    assert !/order/i.match?(scope.to_sql)
   end
 
   def test_unscope_reverse_order
diff --git a/activerecord/test/cases/test_case.rb b/activerecord/test/cases/test_case.rb
index c8adc21bbc..cde5488315 100644
--- a/activerecord/test/cases/test_case.rb
+++ b/activerecord/test/cases/test_case.rb
@@ -115,7 +115,7 @@ module ActiveRecord
       return if 'CACHE' == values[:name]
 
       self.class.log_all << sql
-      self.class.log << sql unless ignore =~ sql
+      self.class.log << sql unless ignore.match?(sql)
     end
   end
 
diff --git a/activerecord/test/schema/postgresql_specific_schema.rb b/activerecord/test/schema/postgresql_specific_schema.rb
index 24713f722a..030ad73621 100644
--- a/activerecord/test/schema/postgresql_specific_schema.rb
+++ b/activerecord/test/schema/postgresql_specific_schema.rb
@@ -88,7 +88,7 @@ _SQL
       FOR EACH ROW EXECUTE PROCEDURE partitioned_insert_trigger();
 _SQL
   rescue ActiveRecord::StatementInvalid => e
-    if e.message =~ /language "plpgsql" does not exist/
+    if e.message.include?('language "plpgsql" does not exist')
       execute "CREATE LANGUAGE 'plpgsql';"
       retry
     else