From d6c704fd2246143180f3d05d51a4fd1093c285d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Thu, 27 Mar 2014 15:02:48 -0300
Subject: [PATCH] Merge pull request #14393 from chrisfinne/persisted_exception

AR .persisted? throws SystemStackError for an unsaved model with a
custom primary_key that didn't save due to validation error

Conflicts:
	activerecord/CHANGELOG.md
---
 activerecord/CHANGELOG.md                      | 7 +++++++
 activerecord/lib/active_record/transactions.rb | 2 +-
 activerecord/test/cases/transactions_test.rb   | 6 ++++++
 activerecord/test/models/movie.rb              | 2 ++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 66e07e99d0ea1..b5759c3d4c990 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,10 @@
+*   Fixed error where .persisted? throws SystemStackError for an unsaved model with a
+    custom primary key that didn't save due to validation error.
+
+    Fixes #14393.
+
+    *Chris Finne*
+
 *   `rake db:structure:dump` only dumps schema information if the schema
     migration table exists.
 
diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb
index ec3e8f281bcfe..17f76b63b3993 100644
--- a/activerecord/lib/active_record/transactions.rb
+++ b/activerecord/lib/active_record/transactions.rb
@@ -369,7 +369,7 @@ def restore_transaction_record_state(force = false) #:nodoc:
           @new_record = restore_state[:new_record]
           @destroyed  = restore_state[:destroyed]
           if restore_state.has_key?(:id)
-            self.id = restore_state[:id]
+            write_attribute(self.class.primary_key, restore_state[:id])
           else
             @attributes.delete(self.class.primary_key)
             @attributes_cache.delete(self.class.primary_key)
diff --git a/activerecord/test/cases/transactions_test.rb b/activerecord/test/cases/transactions_test.rb
index 1664f1a0969cd..e6ed85394b3f6 100644
--- a/activerecord/test/cases/transactions_test.rb
+++ b/activerecord/test/cases/transactions_test.rb
@@ -5,6 +5,7 @@
 require 'models/book'
 require 'models/author'
 require 'models/post'
+require 'models/movie'
 
 class TransactionTest < ActiveRecord::TestCase
   self.use_transactional_fixtures = false
@@ -14,6 +15,11 @@ def setup
     @first, @second = Topic.find(1, 2).sort_by { |t| t.id }
   end
 
+  def test_persisted_in_a_model_with_custom_primary_key_after_failed_save
+    movie = Movie.create
+    assert !movie.persisted?
+  end
+
   def test_raise_after_destroy
     assert_not @first.frozen?
 
diff --git a/activerecord/test/models/movie.rb b/activerecord/test/models/movie.rb
index c441be2bef80a..0302abad1ebaf 100644
--- a/activerecord/test/models/movie.rb
+++ b/activerecord/test/models/movie.rb
@@ -1,3 +1,5 @@
 class Movie < ActiveRecord::Base
   self.primary_key = "movieid"
+
+  validates_presence_of :name
 end