Merge pull request rails#55089 from rails/fxn/class_name

:class_name should be invalid in polymorphic belongs_to

Author: fxn

activerecord/lib/active_record/associations/builder/association.rb

@@ -19,7 +19,7 @@ class << self
     self.extensions = []
 
     VALID_OPTIONS = [
-      :class_name, :anonymous_class, :primary_key, :foreign_key, :dependent, :validate, :inverse_of, :strict_loading, :query_constraints
+      :anonymous_class, :primary_key, :foreign_key, :dependent, :validate, :inverse_of, :strict_loading, :query_constraints
     ].freeze # :nodoc:
 
     def self.build(model, name, scope, options, &block)

activerecord/lib/active_record/associations/builder/belongs_to.rb

@@ -8,8 +8,9 @@ def self.macro
 
     def self.valid_options(options)
       valid = super + [:polymorphic, :counter_cache, :optional, :default]
-      valid += [:foreign_type] if options[:polymorphic]
-      valid += [:ensuring_owner_was] if options[:dependent] == :destroy_async
+      valid << :class_name unless options[:polymorphic]
+      valid << :foreign_type if options[:polymorphic]
+      valid << :ensuring_owner_was if options[:dependent] == :destroy_async
       valid
     end
 

activerecord/lib/active_record/associations/builder/collection_association.rb

@@ -7,7 +7,7 @@ class CollectionAssociation < Association # :nodoc:
     CALLBACKS = [:before_add, :after_add, :before_remove, :after_remove]
 
     def self.valid_options(options)
-      super + [:before_add, :after_add, :before_remove, :after_remove, :extend]
+      super + [:class_name, :before_add, :after_add, :before_remove, :after_remove, :extend]
     end
 
     def self.define_callbacks(model, reflection)

activerecord/lib/active_record/associations/builder/has_one.rb

@@ -7,7 +7,7 @@ def self.macro
     end
 
     def self.valid_options(options)
-      valid = super + [:as, :through]
+      valid = super + [:class_name, :as, :through]
       valid += [:foreign_type] if options[:as]
       valid += [:ensuring_owner_was] if options[:dependent] == :destroy_async
       valid += [:source, :source_type, :disable_joins] if options[:through]

activerecord/test/cases/associations/has_many_associations_test.rb

@@ -3198,8 +3198,8 @@ def test_invalid_key_raises_with_message_including_all_default_options
 
     assert_equal(<<~MESSAGE.squish, error.message)
       Unknown key: :trough. Valid keys are:
-      :class_name, :anonymous_class, :primary_key, :foreign_key, :dependent,
-      :validate, :inverse_of, :strict_loading, :query_constraints, :autosave, :before_add,
+      :anonymous_class, :primary_key, :foreign_key, :dependent, :validate, :inverse_of,
+      :strict_loading, :query_constraints, :autosave, :class_name, :before_add,
       :after_add, :before_remove, :after_remove, :extend, :counter_cache, :join_table,
       :index_errors, :as, :through
     MESSAGE

activerecord/test/models/cpk/comment.rb

@@ -3,7 +3,7 @@
 module Cpk
   class Comment < ActiveRecord::Base
     self.table_name = :cpk_comments
-    belongs_to :commentable, class_name: "Cpk::Post", foreign_key: %i[commentable_title commentable_author], polymorphic: true
-    belongs_to :post, class_name: "Cpk::Post", foreign_key: %i[commentable_title commentable_author]
+    belongs_to :commentable, foreign_key: %i[commentable_title commentable_author], polymorphic: true
+    belongs_to :post, foreign_key: %i[commentable_title commentable_author]
   end
 end

activerecord/test/models/sharded/blog_post.rb

@@ -5,7 +5,7 @@ class BlogPost < ActiveRecord::Base
     self.table_name = :sharded_blog_posts
     query_constraints :blog_id, :id
 
-    belongs_to :parent, class_name: name, polymorphic: true
+    belongs_to :parent, polymorphic: true
     belongs_to :blog
     has_many :comments
     has_many :delete_comments, class_name: "Sharded::Comment", dependent: :delete_all