From df11624ef10470313c5520463d1e24dcc1153a05 Mon Sep 17 00:00:00 2001 From: Rob Date: Sat, 2 May 2009 11:19:16 +0100 Subject: [PATCH] Use quoted table name for JoinAssociation with hash conditions --- activerecord/lib/active_record/associations.rb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 2115878..f3a47c6 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -2123,7 +2123,7 @@ module ActiveRecord klass.send(:type_condition, aliased_table_name)] unless klass.descends_from_active_record? [through_reflection, reflection].each do |ref| - join << "AND #{interpolate_sql(sanitize_sql(ref.options[:conditions], aliased_table_name))} " if ref && ref.options[:conditions] + join << "AND #{interpolate_sql(sanitize_sql(ref.options[:conditions], connection.quote_table_name(aliased_table_name)))} " if ref && ref.options[:conditions] end join -- 1.6.2.1217.gd7bc3