Merge pull request #25972 from kamipo/backport_25146

Backport #25146 to 5-0-stable

activerecord/lib/active_record/table_metadata.rb

@@ -42,7 +42,7 @@ def associated_with?(association_name)
     end
 
     def associated_table(table_name)
-      association = klass._reflect_on_association(table_name)
+      association = klass._reflect_on_association(table_name) || klass._reflect_on_association(table_name.singularize)
 
       if !association && table_name == arel_table.name
         return self

activerecord/test/cases/associations/has_one_associations_test.rb

@@ -659,4 +659,22 @@ def test_association_force_reload_with_only_true_is_deprecated
 
     assert_deprecated { firm.account(true) }
   end
+
+  class SpecialBook < ActiveRecord::Base
+    self.table_name = 'books'
+    belongs_to :author, class_name: 'SpecialAuthor'
+  end
+
+  class SpecialAuthor < ActiveRecord::Base
+    self.table_name = 'authors'
+    has_one :book, class_name: 'SpecialBook', foreign_key: 'author_id'
+  end
+
+  def test_assocation_enum_works_properly
+    author = SpecialAuthor.create!(name: 'Test')
+    book = SpecialBook.create!(status: 'published')
+    author.book = book
+
+    refute_equal 0, SpecialAuthor.joins(:book).where(books: { status: 'published' } ).count
+  end
 end