diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-10-13 15:06:43 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-10-13 15:06:43 -0300 |
| commit | 991d1bc200d6fdc379bc83610bc92a4e220c669e (patch) | |
| tree | 84ace4c9c117ba7bc82824dbddf15485a9305bd2 /activerecord/lib/active_record/connection_adapters | |
| parent | 0cf4662ec589813c4fdc22de3398730cab05c5ed (diff) | |
| parent | 9cd50e7752650a3d6bf8545b51d50619d6e70c0b (diff) | |
| download | rails-991d1bc200d6fdc379bc83610bc92a4e220c669e.tar.gz rails-991d1bc200d6fdc379bc83610bc92a4e220c669e.tar.bz2 rails-991d1bc200d6fdc379bc83610bc92a4e220c669e.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
| -rwxr-xr-x | activerecord/lib/active_record/connection_adapters/abstract_adapter.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb index 78c7a4b697..cdf0aebfee 100755 --- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb @@ -32,7 +32,7 @@ module ActiveRecord class AbstractAdapter include Quoting, DatabaseStatements, SchemaStatements include QueryCache - include ActiveSupport::Callbacks + include ActiveSupport::DeprecatedCallbacks define_callbacks :checkout, :checkin @@row_even = true @@ -75,7 +75,7 @@ module ActiveRecord def supports_ddl_transactions? false end - + # Does this adapter support savepoints? PostgreSQL and MySQL do, SQLite # does not. def supports_savepoints? |