1 files changed, 54 insertions, 4 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index a54526dd41..0f6a31d679 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,8 +1,25 @@
-Wed Sep  7 15:25:02 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+*Rails 3.2.0 (unreleased)*
 
-	* lib/active_record/connection_adapters/mysql_adapter.rb: LRU cache
-	  keys are per process id.
-	* lib/active_record/connection_adapters/sqlite_adapter.rb: ditto
+* Added ActiveRecord::Base.store for declaring simple single-column key/value stores [DHH]
+
+    class User < ActiveRecord::Base
+      store :settings, accessors: [ :color, :homepage ]
+    end
+    
+    u = User.new(color: 'black', homepage: '37signals.com')
+    u.color                          # Accessor stored attribute
+    u.settings[:country] = 'Denmark' # Any attribute, even if not specified with an accessor
+
+
+* MySQL: case-insensitive uniqueness validation avoids calling LOWER when
+  the column already uses a case-insensitive collation. Fixes #561.
+
+  [Joseph Palermo]
+
+* Transactional fixtures enlist all active database connections. You can test
+  models on different connections without disabling transactional fixtures.
+
+  [Jeremy Kemper]
 
 * Add first_or_create, first_or_create!, first_or_initialize methods to Active Record. This is a
   better approach over the old find_or_create_by dynamic methods because it's clearer which
@@ -12,6 +29,38 @@ Wed Sep  7 15:25:02 2011  Aaron Patterson <aaron@tenderlovemaking.com>
 
   [Andrés Mejía]
 
+*Rails 3.1.1 (October 7, 2011)*
+
+* Add deprecation for the preload_associations method. Fixes #3022.
+
+  [Jon Leighton]
+
+* Don't require a DB connection when loading a model that uses set_primary_key. GH #2807.
+
+  [Jon Leighton]
+
+* Fix using select() with a habtm association, e.g. Person.friends.select(:name). GH #3030 and
+  #2923.
+
+  [Hendy Tanata]
+
+* Fix belongs_to polymorphic with custom primary key on target. GH #3104.
+
+  [Jon Leighton]
+
+* CollectionProxy#replace should change the DB records rather than just mutating the array.
+  Fixes #3020.
+
+  [Jon Leighton]
+
+* LRU cache in mysql and sqlite are now per-process caches.
+
+	* lib/active_record/connection_adapters/mysql_adapter.rb: LRU cache
+	  keys are per process id.
+	* lib/active_record/connection_adapters/sqlite_adapter.rb: ditto
+
+  [Aaron Patterson]
+
 * Support bulk change_table in mysql2 adapter, as well as the mysql one. [Jon Leighton]
 
 * If multiple parameters are sent representing a date, and some are blank, the
@@ -36,6 +85,7 @@ a URI that specifies the connection configuration.  For example:
 
   [Prem Sichanugrist]
 
+
 *Rails 3.1.0 (August 30, 2011)*
 
 * Add a proxy_association method to association proxies, which can be called by association