Merge pull request #35116 from kamipo/fix_through_association_creation

Fix has_many through association creation

4 files changed, 11 insertions, 27 deletions

diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb
index b2110f727c..6d2f75a3ae 100644
--- a/activerecord/lib/active_record/reflection.rb
+++ b/activerecord/lib/active_record/reflection.rb
@@ -612,21 +612,9 @@ module ActiveRecord
 
         # returns either +nil+ or the inverse association name that it finds.
         def automatic_inverse_of
-          return unless can_find_inverse_of_automatically?(self)
+          if can_find_inverse_of_automatically?(self)
+            inverse_name = ActiveSupport::Inflector.underscore(options[:as] || active_record.name.demodulize).to_sym
 
-          inverse_name_candidates =
-            if options[:as]
-              [options[:as]]
-            else
-              active_record_name = active_record.name.demodulize
-              [active_record_name, ActiveSupport::Inflector.pluralize(active_record_name)]
-            end
-
-          inverse_name_candidates.map! do |candidate|
-            ActiveSupport::Inflector.underscore(candidate).to_sym
-          end
-
-          inverse_name_candidates.detect do |inverse_name|
             begin
               reflection = klass._reflect_on_association(inverse_name)
             rescue NameError
@@ -635,7 +623,9 @@ module ActiveRecord
               reflection = false
             end
 
-            valid_inverse_reflection?(reflection)
+            if valid_inverse_reflection?(reflection)
+              return inverse_name
+            end
           end
         end
 
diff --git a/activerecord/test/cases/associations/has_many_through_associations_test.rb b/activerecord/test/cases/associations/has_many_through_associations_test.rb
index bd535357ee..0133beccec 100644
--- a/activerecord/test/cases/associations/has_many_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_through_associations_test.rb
@@ -46,6 +46,10 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
     Reader.create person_id: 0, post_id: 0
   end
 
+  def test_has_many_through_create_record
+    assert books(:awdr).subscribers.create!(nick: "bob")
+  end
+
   def test_marshal_dump
     preloaded = Post.includes(:first_blue_tags).first
     assert_equal preloaded, Marshal.load(Marshal.dump(preloaded))
diff --git a/activerecord/test/cases/associations/inverse_associations_test.rb b/activerecord/test/cases/associations/inverse_associations_test.rb
index eb4dc73423..da3a42e2b5 100644
--- a/activerecord/test/cases/associations/inverse_associations_test.rb
+++ b/activerecord/test/cases/associations/inverse_associations_test.rb
@@ -20,8 +20,6 @@ require "models/company"
 require "models/project"
 require "models/author"
 require "models/post"
-require "models/department"
-require "models/hotel"
 
 class AutomaticInverseFindingTests < ActiveRecord::TestCase
   fixtures :ratings, :comments, :cars
@@ -726,16 +724,6 @@ class InversePolymorphicBelongsToTests < ActiveRecord::TestCase
     # fails because Interest does have the correct inverse_of
     assert_raise(ActiveRecord::InverseOfAssociationNotFoundError) { Face.first.polymorphic_man = Interest.first }
   end
-
-  def test_favors_has_one_associations_for_inverse_of
-    inverse_name = Post.reflect_on_association(:author).inverse_of.name
-    assert_equal :post, inverse_name
-  end
-
-  def test_finds_inverse_of_for_plural_associations
-    inverse_name = Department.reflect_on_association(:hotel).inverse_of.name
-    assert_equal :departments, inverse_name
-  end
 end
 
 # NOTE - these tests might not be meaningful, ripped as they were from the parental_control plugin
diff --git a/activerecord/test/models/subscription.rb b/activerecord/test/models/subscription.rb
index d1d5d21621..f87315fcd1 100644
--- a/activerecord/test/models/subscription.rb
+++ b/activerecord/test/models/subscription.rb
@@ -3,4 +3,6 @@
 class Subscription < ActiveRecord::Base
   belongs_to :subscriber, counter_cache: :books_count
   belongs_to :book
+
+  validates_presence_of :subscriber_id, :book_id
 end