From e4790a2c5b99704f430c837d8f22fec418f2c8af Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@gmail.com>
Date: Sun, 28 Oct 2012 18:05:30 +0100
Subject: raise `ArgumentError` when redefining the primary key column. Closes
 #6378

---
 activerecord/CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'activerecord/CHANGELOG.md')

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index f630be6f70..4916777ce7 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   The `create_table` method raises an `ArgumentError` when the primary key column is redefined.
+    Fix #6378
+
+    *Yves Senn*
+
 *   `ActiveRecord::AttributeMethods#[]` raises `ActiveModel::MissingAttributeError`
     error if the given attribute is missing. Fixes #5433.
 
-- 
cgit v1.2.3