From 81add465f40d9ab403807f3058c7d228b3137d22 Mon Sep 17 00:00:00 2001 From: Ian White Date: Mon, 1 Jun 2009 07:56:13 +0100 Subject: [PATCH] Use AR::Base.type_condition to construct conditions --- lib/nested_has_many_through.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/nested_has_many_through.rb b/lib/nested_has_many_through.rb index ab23328..a940012 100644 --- a/lib/nested_has_many_through.rb +++ b/lib/nested_has_many_through.rb @@ -105,8 +105,8 @@ def construct_has_many_or_belongs_to_attributes(reflection, association_class, t end conditions = '' - # Add filter for single-table inheritance, if applicable. - conditions += " AND #{remote_table_alias}.#{association_class.inheritance_column} = #{association_class.quote_value(association_class.name.demodulize)}" unless association_class.descends_from_active_record? + # Add type_condition, if applicable + conditions += " AND #{association_class.send(:type_condition, remote_table_alias)}" unless association_class.descends_from_active_record? # Add custom conditions conditions += " AND (#{interpolate_sql(association_class.send(:sanitize_sql, reflection.options[:conditions]))})" if reflection.options[:conditions]