1 files changed, 5 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/belongs_to_association.rb b/activerecord/lib/active_record/associations/belongs_to_association.rb
index aa627f7495..8de48cd880 100644
--- a/activerecord/lib/active_record/associations/belongs_to_association.rb
+++ b/activerecord/lib/active_record/associations/belongs_to_association.rb
@@ -45,12 +45,16 @@ module ActiveRecord
       private
         def find_target
           if @options[:conditions]
-            @association_class.find_on_conditions(@owner[@association_class_primary_key_name], @options[:conditions])
+            @association_class.find_on_conditions(@owner[@association_class_primary_key_name], interpolate_sql(@options[:conditions]))
           else
             @association_class.find(@owner[@association_class_primary_key_name])
           end
         end
 
+        def foreign_key_present
+          !@owner[@association_class_primary_key_name].nil?
+        end
+
         def target_obsolete?
           @owner[@association_class_primary_key_name] != @target.id
         end