Merge pull request rails#51408 from viralpraxis/add-through-to-has-many-and-has-one-association-options-list

Ensure all needed options are added to association options list unconditionally

Author: rafaelfranca

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

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

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

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

activerecord/test/cases/associations/has_many_associations_test.rb

@@ -3184,6 +3184,22 @@ def test_key_ensuring_owner_was_is_not_valid_without_dependent_option
     assert_match(/Unknown key: :ensuring_owner_was/, error.message)
   end
 
+  def test_invalid_key_raises_with_message_including_all_default_options
+    error = assert_raises(ArgumentError) do
+      Class.new(ActiveRecord::Base) do
+        has_many :books, trough: :users
+      end
+    end
+
+    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,
+      :after_add, :before_remove, :after_remove, :extend, :counter_cache, :join_table,
+      :index_errors, :as, :through
+    MESSAGE
+  end
+
   def test_key_ensuring_owner_was_is_valid_when_dependent_option_is_destroy_async
     Class.new(ActiveRecord::Base) do
       self.destroy_association_async_job = Class.new