diff options
Diffstat (limited to 'activerecord/lib/active_record.rb')
| -rwxr-xr-x | activerecord/lib/active_record.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index ddd1f9ff4c..0fb36dbfb3 100755 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -46,7 +46,8 @@ require 'active_record/timestamp' require 'active_record/acts/list' require 'active_record/acts/tree' require 'active_record/acts/nested_set' -require 'active_record/locking' +require 'active_record/locking/optimistic' +require 'active_record/locking/pessimistic' require 'active_record/migration' require 'active_record/schema' require 'active_record/calculations' @@ -55,6 +56,7 @@ require 'active_record/xml_serialization' ActiveRecord::Base.class_eval do include ActiveRecord::Validations include ActiveRecord::Locking::Optimistic + include ActiveRecord::Locking::Pessimistic include ActiveRecord::Callbacks include ActiveRecord::Observing include ActiveRecord::Timestamp |