1 files changed, 3 insertions, 14 deletions
diff --git a/activerecord/lib/active_record/associations/has_one_association.rb b/activerecord/lib/active_record/associations/has_one_association.rb
index d08cbea199..fd3827390f 100644
--- a/activerecord/lib/active_record/associations/has_one_association.rb
+++ b/activerecord/lib/active_record/associations/has_one_association.rb
@@ -49,7 +49,7 @@ module ActiveRecord
           @target = nil
         else
           raise_on_type_mismatch(obj)
-          set_belongs_to_association_for(obj)
+          set_owner_attributes(obj)
           @target = (AssociationProxy === obj ? obj.target : obj)
         end
 
@@ -84,22 +84,11 @@ module ActiveRecord
         end
 
         def construct_find_scope
-          if @reflection.options[:as]
-            sql =
-              "#{@reflection.quoted_table_name}.#{@reflection.options[:as]}_id = #{owner_quoted_id} AND " +
-              "#{@reflection.quoted_table_name}.#{@reflection.options[:as]}_type = #{@owner.class.quote_value(@owner.class.base_class.name.to_s)}"
-          else
-            test = owner_quoted_id == "NULL" ? "IS" : "="
-            sql = "#{@reflection.quoted_table_name}.#{@reflection.primary_key_name} #{test} #{owner_quoted_id}"
-          end
-          sql << " AND (#{conditions})" if conditions
-          { :conditions => sql }
+          { :conditions => construct_conditions }
         end
 
         def construct_create_scope
-          create_scoping = {}
-          set_belongs_to_association_for(create_scoping)
-          create_scoping
+          construct_owner_attributes
         end
 
         def new_record(replace_existing)