From 83689bec7737f7b03b1ba245c644071ed983349b Mon Sep 17 00:00:00 2001 From: Jason Ayre Date: Wed, 6 Nov 2013 18:22:53 -0700 Subject: [PATCH 1/2] add autoload :TransactionState to fix Marshal.load issues --- activerecord/CHANGELOG.md | 5 +++++ .../active_record/connection_adapters/abstract_adapter.rb | 1 + 2 files changed, 6 insertions(+) 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 ConnectionAdapters # :nodoc: autoload :ClosedTransaction autoload :RealTransaction autoload :SavepointTransaction + autoload :TransactionState end # Active Record supports multiple database systems. AbstractAdapter and From 746d2860260e07da7bffc79b7492dfe995e9ec29 Mon Sep 17 00:00:00 2001 From: Jason Ayre Date: Thu, 7 Nov 2013 07:55:29 -0700 Subject: [PATCH 2/2] revised changelog comment to be less than 80 chars --- activerecord/CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index fc6d9ec02b..2006558ab2 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,5 +1,5 @@ -* Fix `Uninitialized constant ActiveRecord::ConnectionAdapters::TransactionState error when trying to Marshall.load AR Result. - Adds autoload :TransactionState, fixes #12790 +* Fix uninitialized constant TransactionState error when Marshall.load is used on an Active Record result. + Fixes #12790 *Jason Ayre*