aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-09-29 16:07:59 -0300
committerSantiago Pastorino <santiago@wyeworks.com>2011-09-29 16:49:31 -0300
commitd2888de5985c7018a5be23d44143ec3c6cef9032 (patch)
tree4b09c886a56ef5021a88e117ee285e376d37a100 /activerecord
parentadb8ac153f8e9e497eaecf62165c0bd53c18149a (diff)
downloadrails-d2888de5985c7018a5be23d44143ec3c6cef9032.tar.gz
rails-d2888de5985c7018a5be23d44143ec3c6cef9032.tar.bz2
rails-d2888de5985c7018a5be23d44143ec3c6cef9032.zip
Add CHANGELOG entries
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG26
1 files changed, 25 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index a54526dd41..f974b5d237 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,4 +1,28 @@
-Wed Sep 7 15:25:02 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+*Rails 3.1.1 (unreleased)*
+
+* 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.