Merge pull request rails#50162 from misdoro/50160_allow_object_id_column_name

Allow `object_id` as a column name for ActiveRecord

Author: byroot

activerecord/lib/active_record/attribute_methods.rb

@@ -33,7 +33,7 @@ def dangerous_attribute_methods # :nodoc:
           Base.private_instance_methods -
           Base.superclass.instance_methods -
           Base.superclass.private_instance_methods +
-          %i[__id__ dup freeze frozen? hash object_id class clone]
+          %i[__id__ dup freeze frozen? hash class clone]
         ).map { |m| -m.to_s }.to_set.freeze
       end
     end

activerecord/test/cases/associations_test.rb

@@ -1261,7 +1261,7 @@ def test_preload_with_available_records_with_through_association
     end
 
     assert_predicate author.association(:essay_category), :loaded?
-    assert categories.map(&:object_id).include?(author.essay_category.object_id)
+    assert categories.map(&:__id__).include?(author.essay_category.__id__)
   end
 
   def test_preload_with_only_some_records_available_with_through_associations
@@ -1307,7 +1307,7 @@ def test_preload_with_available_records_queries_when_scoped
     end
 
     assert_predicate post.association(:author), :loaded?
-    assert_not_equal david.object_id, post.author.object_id
+    assert_not_equal david.__id__, post.author.__id__
   end
 
   def test_preload_with_available_records_queries_when_collection
@@ -1319,7 +1319,7 @@ def test_preload_with_available_records_queries_when_collection
     end
 
     assert_predicate post.association(:comments), :loaded?
-    assert_empty post.comments.map(&:object_id) & comments.map(&:object_id)
+    assert_empty post.comments.map(&:__id__) & comments.map(&:__id__)
   end
 
   def test_preload_with_available_records_queries_when_incomplete