Merge branch 'master' into nested_has_many_through

Conflicts:
	activerecord/lib/active_record/associations/has_many_through_association.rb
	activerecord/test/cases/associations/has_many_through_associations_test.rb

1 files changed, 6 insertions, 5 deletions

diff --git a/activerecord/lib/active_record/persistence.rb b/activerecord/lib/active_record/persistence.rb
index 707c1a05be..594a2214bb 100644
--- a/activerecord/lib/active_record/persistence.rb
+++ b/activerecord/lib/active_record/persistence.rb
@@ -4,7 +4,7 @@ module ActiveRecord
     # Returns true if this object hasn't been saved yet -- that is, a record
     # for the object doesn't exist in the data store yet; otherwise, returns false.
     def new_record?
-      @new_record
+      !@persisted
     end
 
     # Returns true if this object has been destroyed, otherwise returns false.
@@ -15,7 +15,7 @@ module ActiveRecord
     # Returns if the record is persisted, i.e. it's not a new record and it was
     # not destroyed.
     def persisted?
-      !(new_record? || destroyed?)
+      @persisted && !destroyed?
     end
 
     # Saves the model.
@@ -94,8 +94,9 @@ module ActiveRecord
       became = klass.new
       became.instance_variable_set("@attributes", @attributes)
       became.instance_variable_set("@attributes_cache", @attributes_cache)
-      became.instance_variable_set("@new_record", new_record?)
+      became.instance_variable_set("@persisted", persisted?)
       became.instance_variable_set("@destroyed", destroyed?)
+      became.type = klass.name unless self.class.descends_from_active_record?
       became
     end
 
@@ -240,7 +241,7 @@ module ActiveRecord
   private
     def create_or_update
       raise ReadOnlyRecord if readonly?
-      result = new_record? ? create : update
+      result = persisted? ? update : create
       result != false
     end
 
@@ -269,7 +270,7 @@ module ActiveRecord
 
       self.id ||= new_id
 
-      @new_record = false
+      @persisted = true
       id
     end