diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-11-07 14:15:33 -0800 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-11-07 14:15:33 -0800 |
| commit | 587f15d19137416a78114ba77b27aac9ce501e5f (patch) | |
| tree | 8eff04754267071ae21bebf3512aa5f17e819bb5 /activerecord | |
| parent | b683ec623a261bae075c49aa35ff348e0920c795 (diff) | |
| parent | 746d2860260e07da7bffc79b7492dfe995e9ec29 (diff) | |
| download | rails-587f15d19137416a78114ba77b27aac9ce501e5f.tar.gz rails-587f15d19137416a78114ba77b27aac9ce501e5f.tar.bz2 rails-587f15d19137416a78114ba77b27aac9ce501e5f.zip | |
Merge pull request #12791 from jasonayre/ja/fix_autoload_error
add autoload :TransactionState to fix Marshal.load issues
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_adapter.rb | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 0497f6326e..2006558ab2 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,8 @@ +* Fix uninitialized constant TransactionState error when Marshall.load is used on an Active Record result. + Fixes #12790 + + *Jason Ayre* + * `.unscope` now removes conditions specified in `default_scope`. *Jon Leighton* diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb index cbe563676b..86c27557b4 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb @@ -40,6 +40,7 @@ module ActiveRecord autoload :ClosedTransaction autoload :RealTransaction autoload :SavepointTransaction + autoload :TransactionState end # Active Record supports multiple database systems. AbstractAdapter and |