1 files changed, 121 insertions, 15 deletions

diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 4dc652c08e..10ad35ae3c 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,8 +1,113 @@
-*Rails 3.1.0 (unreleased)*
+*Rails 3.1.1 (unreleased)*
+
+* Transactional fixtures enlist all active database connections. You can test
+  models on different connections without disabling transactional fixtures.
+
+  [Jeremy Kemper]
+
+* 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
+
+* 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
+  arguments are used to find the record and which are used to create it:
+
+    User.where(:first_name => "Scarlett").first_or_create!(:last_name => "Johansson")
+
+  [Andrés Mejía]
+
+* 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
+resulting object is nil. In previous releases those values defaulted to 1. This
+only affects existing but blank parameters, missing ones still raise an error.
+[Akira Matsuda]
+
+* ActiveRecord::Base.establish_connection now takes a string that contains
+a URI that specifies the connection configuration.  For example:
+
+    ActiveRecord::Base.establish_connection 'postgres://localhost/foo'
+
+* Active Record's dynamic finder will now raise the error if you passing in less number of arguments than what you call in method signature.
+
+  So if you were doing this and expecting the second argument to be nil:
+
+    User.find_by_username_and_group("sikachu")
+
+  You'll now get `ArgumentError: wrong number of arguments (1 for 2).` You'll then have to do this:
+
+    User.find_by_username_and_group("sikachu", nil)
+
+  [Prem Sichanugrist]
+
+*Rails 3.1.0 (August 30, 2011)*
+
+* Add a proxy_association method to association proxies, which can be called by association
+  extensions to access information about the association. This replaces proxy_owner etc with
+  proxy_association.owner.
+
+  [Jon Leighton]
+
+* ActiveRecord::MacroReflection::AssociationReflection#build_record has a new method signature.
+
+  Before: def build_association(*options)
+  After:  def build_association(*options, &block)
+
+  Users who are redefining this method to extend functionality should ensure that the block is
+  passed through to ActiveRecord::Base#new.
+
+  This change is necessary to fix https://github.com/rails/rails/issues/1842.
+
+  [Jon Leighton]
+
+* AR#pluralize_table_names can be used to singularize/pluralize table name of an individual model:
+
+    class User < ActiveRecord::Base
+      self.pluralize_table_names = false
+    end
+
+  Previously this could only be set globally for all models through ActiveRecord::Base.pluralize_table_names. [Guillermo Iguaran]
+
+* Add block setting of attributes to singular associations:
+
+    class User < ActiveRecord::Base
+      has_one :account
+    end
+
+    user.build_account{ |a| a.credit_limit => 100.0 }
+
+  The block is called after the instance has been initialized. [Andrew White]
+
+* Add ActiveRecord::Base.attribute_names to return a list of attribute names. This will return an empty array if the model is abstract or table does not exists. [Prem Sichanugrist]
 
 * CSV Fixtures are deprecated and support will be removed in Rails 3.2.0
 
-* AR#new, AR#create and AR#update_attributes all accept a second hash as option that allows you
+* AR#new, AR#create, AR#create!, AR#update_attributes and AR#update_attributes! all accept a second hash as option that allows you
   to specify which role to consider when assigning attributes. This is built on top of ActiveModel's
   new mass assignment capabilities:
 
@@ -14,7 +119,9 @@
     Post.new(params[:post], :as => :admin)
 
   assign_attributes() with similar API was also added and attributes=(params, guard) was deprecated.
-  
+
+  Please note that this changes the method signatures for AR#new, AR#create, AR#create!, AR#update_attributes and AR#update_attributes!. If you have overwritten these methods you should update them accordingly.
+
   [Josh Kalderimis]
 
 * default_scope can take a block, lambda, or any other object which responds to `call` for lazy
@@ -218,7 +325,6 @@
       def up
         create_table :posts do |t|
           t.belongs_to :user
-
           t.timestamps
         end
 
@@ -611,12 +717,12 @@ query.
 
 * Add Support for updating deeply nested models from a single form. #1202 [Eloy Duran]
 
-	class Book < ActiveRecord::Base
-	  has_one :author
-	  has_many :pages
+  class Book < ActiveRecord::Base
+    has_one :author
+    has_many :pages
 
-	  accepts_nested_attributes_for :author, :pages
-	end
+    accepts_nested_attributes_for :author, :pages
+  end
 
 * Make after_save callbacks fire only if the record was successfully saved.  #1735 [Michael Lovitt]
 
@@ -1036,7 +1142,7 @@ so newlines etc are escaped #10385 [Norbert Crombach]
   "foo.bar" => "`foo`.`bar`"
 
 * Complete the assimilation of Sexy Migrations from ErrFree [Chris Wanstrath, PJ Hyett]
-	http://errtheblog.com/post/2381
+  http://errtheblog.com/post/2381
 
 * Qualified column names work in hash conditions, like :conditions => { 'comments.created_at' => ... }.  #9733 [Jack Danger Canty]
 
@@ -1152,7 +1258,7 @@ single-table inheritance.  #3833, #9886 [Gabriel Gironda, rramdas, François Bea
 
 * Improve performance and functionality of the postgresql adapter.  Closes #8049 [roderickvd]
 
-	For more information see: http://dev.rubyonrails.org/ticket/8049
+  For more information see: http://dev.rubyonrails.org/ticket/8049
 
 * Don't clobber includes passed to has_many.count [Jack Danger Canty]
 
@@ -1662,8 +1768,8 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 * Added support for conditions on Base.exists? #5689 [Josh Peek]. Examples:
 
     assert (Topic.exists?(:author_name => "David"))
- 	  assert (Topic.exists?(:author_name => "Mary", :approved => true))
- 	  assert (Topic.exists?(["parent_id = ?", 1]))
+     assert (Topic.exists?(:author_name => "Mary", :approved => true))
+     assert (Topic.exists?(["parent_id = ?", 1]))
 
 * Schema dumper quotes date :default values. [Dave Thomas]
 
@@ -2119,8 +2225,8 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 * Added support for conditions on Base.exists? #5689 [Josh Peek]. Examples:
 
     assert (Topic.exists?(:author_name => "David"))
- 	  assert (Topic.exists?(:author_name => "Mary", :approved => true))
- 	  assert (Topic.exists?(["parent_id = ?", 1]))
+     assert (Topic.exists?(:author_name => "Mary", :approved => true))
+     assert (Topic.exists?(["parent_id = ?", 1]))
 
 * Schema dumper quotes date :default values. [Dave Thomas]