Merge pull request #55543 from a5-stable/avoid-filter-attribute-for-base

no need for filter_parameters in base model

Author: byroot

activerecord/lib/active_record/filter_attribute_handler.rb

@@ -62,7 +62,7 @@ def collect_for_later(klass, list)
 
       def apply_filter(klass, list)
         list.each do |attribute|
-          next if klass.abstract_class?
+          next if klass.abstract_class? || klass == Base
 
           klass_name = klass.name ? klass.model_name.element : nil
           filter = [klass_name, attribute.to_s].compact.join(".")

railties/test/application/active_record_railtie_test.rb

@@ -71,6 +71,8 @@ class Message < ActiveRecord::Base
     test "filter_parameters are inherited from AR parent classes" do
       app "development"
 
+      ActiveRecord::Base.filter_attributes += [ "expires_at" ]
+
       class ApplicationRecord < ActiveRecord::Base
         self.abstract_class = true
         self.filter_attributes += [ "expires_at" ]
@@ -84,6 +86,7 @@ class CreditCard < ApplicationRecord
       assert_includes Rails.application.config.filter_parameters, "credit_card.expires_at"
       assert_includes Rails.application.config.filter_parameters, "credit_card.digits"
       assert_not_includes Rails.application.config.filter_parameters, "application_record.expires_at"
+      assert_not_includes Rails.application.config.filter_parameters, "base.expires_at"
     end
   end
 end