aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Ayre <jasonayre@gmail.com>2013-11-06 18:22:53 -0700
committerJason Ayre <jasonayre@gmail.com>2013-11-07 07:57:13 -0700
commit83689bec7737f7b03b1ba245c644071ed983349b (patch)
tree04ba0a30c1c7fe5f84501175db7d48c9f7dbe0ed
parent0fca7d67d4b748584e589bea69db1988b3138cb0 (diff)
downloadrails-83689bec7737f7b03b1ba245c644071ed983349b.tar.gz
rails-83689bec7737f7b03b1ba245c644071ed983349b.tar.bz2
rails-83689bec7737f7b03b1ba245c644071ed983349b.zip
add autoload :TransactionState to fix Marshal.load issues
-rw-r--r--activerecord/CHANGELOG.md5
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract_adapter.rb1
2 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 0497f6326e..fc6d9ec02b 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,8 @@
+* Fix `Uninitialized constant ActiveRecord::ConnectionAdapters::TransactionState error when trying to Marshall.load AR Result.
+ Adds autoload :TransactionState, 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