Merge pull request rails#50701 from rails/rm-load-schema

Make sure attribute_aliases is consistent

Author: rafaelfranca

activerecord/lib/active_record/attribute_methods.rb

@@ -120,9 +120,6 @@ def define_attribute_methods # :nodoc:
           unless abstract_class?
             load_schema
             super(attribute_names)
-            if _has_attribute?("id")
-              alias_attribute(:id_value, :id)
-            end
           end
 
           ActiveSupport::CodeGenerator.batch(generated_attribute_methods, __FILE__, __LINE__) do |code_generator|

activerecord/lib/active_record/attribute_methods/primary_key.rb

@@ -152,6 +152,11 @@ def inherited(base)
                 @attributes_builder = nil
               end
             end
+
+            def load_schema! # :nodoc:
+              super
+              alias_attribute :id_value, :id if @columns_hash.key?("id")
+            end
         end
     end
   end

activerecord/test/cases/attribute_methods_test.rb

@@ -32,6 +32,15 @@ def setup
     ActiveRecord::Base.send(:attribute_method_patterns).concat(@old_matchers)
   end
 
+  test "#id_value alias is defined if id column exist" do
+    new_topic_model = Class.new(ActiveRecord::Base) do
+      self.table_name = "topics"
+    end
+
+    assert_includes new_topic_model.attribute_names, "id"
+    assert_includes new_topic_model.attribute_aliases, "id_value"
+  end
+
   test "aliasing `id` attribute allows reading the column value" do
     topic = Topic.create(id: 123_456, title: "title").becomes(TitlePrimaryKeyTopic)