Merge pull request #12791 from jasonayre/ja/fix_autoload_error

add autoload :TransactionState to fix Marshal.load issues
2013-11-07 14:15:33 -08:00 · 2013-11-07 14:15:33 -08:00 · 587f15d191
commit 587f15d191
parent b683ec623a 746d286026
2 changed files with 6 additions and 0 deletions
--- 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*
--- 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 ConnectionAdapters # :nodoc:
      autoload :ClosedTransaction
      autoload :RealTransaction
      autoload :SavepointTransaction
+      autoload :TransactionState
    end

    # Active Record supports multiple database systems. AbstractAdapter and