From 99cf7558000090668b137085bfe6bcc06c4571dc Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Sat, 23 Jul 2016 20:01:56 +0200 Subject: systematic revision of =~ usage in AR Where appropriatei, prefer the more concise Regexp#match?, String#include?, String#start_with?, or String#end_with? --- activerecord/lib/active_record/model_schema.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'activerecord/lib/active_record/model_schema.rb') 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 -- cgit v1.2.3