From d79838fdcbe4c6a2a424b79309fe4623ccdd4a76 Mon Sep 17 00:00:00 2001 From: Jamis Buck Date: Sat, 11 Jun 2005 10:06:47 +0000 Subject: Allow before/after update hooks to work on models with optimistic locking git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1400 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/CHANGELOG | 2 ++ activerecord/lib/active_record.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index c464f6eabb..5738815e78 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Allow before/after update hooks to work on models using optimistic locking + * Eager loading of dependent has_one associations won't delete the association #1212 * Added a second parameter to the build and create method for has_one that controls whether the existing association should be replaced (which means nullifying its foreign key as well). By default this is true, but false can be passed to prevent it. diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index a6169272a1..9d821d17e9 100755 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -49,8 +49,8 @@ require 'active_record/migration' ActiveRecord::Base.class_eval do include ActiveRecord::Validations - include ActiveRecord::Callbacks include ActiveRecord::Locking + include ActiveRecord::Callbacks include ActiveRecord::Timestamp include ActiveRecord::Associations include ActiveRecord::Aggregations -- cgit v1.2.3