From 8e2e5f9e3d1f434e265dc104ea9b00ff75702fc3 Mon Sep 17 00:00:00 2001 From: Jon Moss Date: Wed, 25 May 2016 20:51:37 -0400 Subject: Fix `has_one` `enum` `where` queries Fixes #25128 --- activerecord/lib/active_record/table_metadata.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/table_metadata.rb b/activerecord/lib/active_record/table_metadata.rb index 0faad48ce3..a1326aa359 100644 --- a/activerecord/lib/active_record/table_metadata.rb +++ b/activerecord/lib/active_record/table_metadata.rb @@ -44,7 +44,8 @@ module ActiveRecord def associated_table(table_name) return self if table_name == arel_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 && !association.polymorphic? association_klass = association.klass arel_table = association_klass.arel_table.alias(table_name) -- cgit v1.2.3