diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb index 5440ab54a3a..88fd6cd3625 100644 --- a/activerecord/lib/active_record/attribute_methods.rb +++ b/activerecord/lib/active_record/attribute_methods.rb @@ -20,7 +20,7 @@ module ActiveRecord include Serialization end - RESTRICTED_CLASS_METHODS = %w(private public protected allocate new name parent superclass) + RESTRICTED_CLASS_METHODS = %w(private public protected allocate new name superclass) class GeneratedAttributeMethods < Module # :nodoc: LOCK = Monitor.new diff --git a/activerecord/test/cases/enum_test.rb b/activerecord/test/cases/enum_test.rb index 950f8005893..4865197bca5 100644 --- a/activerecord/test/cases/enum_test.rb +++ b/activerecord/test/cases/enum_test.rb @@ -535,7 +535,7 @@ class EnumTest < ActiveRecord::TestCase :save, # generates #save!, which conflicts with an AR method :proposed, # same value as an existing enum :public, :private, :protected, # some important methods on Module and Class - :name, :parent, :superclass, + :name, :superclass, :id # conflicts with AR querying ] diff --git a/activerecord/test/cases/scoping/named_scoping_test.rb b/activerecord/test/cases/scoping/named_scoping_test.rb index df92453fe26..52c8a8ba991 100644 --- a/activerecord/test/cases/scoping/named_scoping_test.rb +++ b/activerecord/test/cases/scoping/named_scoping_test.rb @@ -363,7 +363,6 @@ class NamedScopingTest < ActiveRecord::TestCase :protected, :private, :name, - :parent, :superclass ]