diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-31 19:38:04 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-31 19:38:04 +0000 |
| commit | fbf9281f0e3ced714bc534821c8b241ed7ec358e (patch) | |
| tree | 890ca27b4ca235627f0be7b31ec7ce511f7c5968 /activerecord/lib/active_record.rb | |
| parent | 60caf0e66172667400777674d09ade1032907076 (diff) | |
| download | rails-fbf9281f0e3ced714bc534821c8b241ed7ec358e.tar.gz rails-fbf9281f0e3ced714bc534821c8b241ed7ec358e.tar.bz2 rails-fbf9281f0e3ced714bc534821c8b241ed7ec358e.zip | |
Added automated optimistic locking if the field lock_version is present #384 [Michael Koziarski]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@295 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record.rb')
| -rwxr-xr-x | activerecord/lib/active_record.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index ecf8499e16..963a14dd3e 100755 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -39,11 +39,13 @@ require 'active_record/reflection' require 'active_record/timestamp' require 'active_record/acts/list' require 'active_record/acts/tree' +require 'active_record/locking' ActiveRecord::Base.class_eval do include ActiveRecord::Validations - include ActiveRecord::Timestamp include ActiveRecord::Callbacks + include ActiveRecord::Locking + include ActiveRecord::Timestamp include ActiveRecord::Associations include ActiveRecord::Aggregations include ActiveRecord::Transactions @@ -55,4 +57,4 @@ end require 'active_record/connection_adapters/mysql_adapter' require 'active_record/connection_adapters/postgresql_adapter' require 'active_record/connection_adapters/sqlite_adapter' -require 'active_record/connection_adapters/sqlserver_adapter'
\ No newline at end of file +require 'active_record/connection_adapters/sqlserver_adapter' |