Consolidated different create and create! versions to call through to the base class with scope. This fixes inconsistencies, especially related to protected attribtues.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5684 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 30 insertions, 3 deletions

diff --git a/activerecord/lib/active_record/associations/has_one_association.rb b/activerecord/lib/active_record/associations/has_one_association.rb
index 4ccd725ebd..9beddb2ac9 100644
--- a/activerecord/lib/active_record/associations/has_one_association.rb
+++ b/activerecord/lib/active_record/associations/has_one_association.rb
@@ -6,9 +6,29 @@ module ActiveRecord
         construct_sql
       end
 
-      def create(attributes = {}, replace_existing = true)
-        record = build(attributes, replace_existing)
-        record.save
+      def create(attrs = {}, replace_existing = true)
+        record = @reflection.klass.with_scope(construct_scope) { @reflection.klass.create(attrs) }                
+
+        if replace_existing
+          replace(record, true) 
+        else
+          record[@reflection.primary_key_name] = @owner.id unless @owner.new_record?
+          self.target = record
+        end
+
+        record
+      end
+
+      def create!(attrs = {}, replace_existing = true)
+        record = @reflection.klass.with_scope(construct_scope) { @reflection.klass.create!(attrs) }                
+
+        if replace_existing
+          replace(record, true) 
+        else
+          record[@reflection.primary_key_name] = @owner.id unless @owner.new_record?
+          self.target = record
+        end
+
         record
       end
 
@@ -75,6 +95,13 @@ module ActiveRecord
           end
           @finder_sql << " AND (#{conditions})" if conditions
         end
+        
+        def construct_scope
+          create_scoping = {}
+          set_belongs_to_association_for(create_scoping)
+          { :create => create_scoping }
+        end
+        
     end
   end
 end