Merge pull request #8441 from itzki/fix_decorate_columns

Backport test to ensure there won't be regressions.
The issue only happens on master at the moment.

1 files changed, 13 insertions, 0 deletions

diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 2497b18e15..70da8b7cd0 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -1442,6 +1442,19 @@ class BasicsTest < ActiveRecord::TestCase
     Topic.serialize(:content)
   end
 
+  def test_serialize_attribute_via_select_method_when_time_zone_available
+    ActiveRecord::Base.time_zone_aware_attributes = true
+    Topic.serialize(:content, MyObject)
+
+    myobj = MyObject.new('value1', 'value2')
+    topic = Topic.create(content: myobj)
+
+    assert_equal(myobj, Topic.select(:content).find(topic.id).content)
+    assert_raise(ActiveModel::MissingAttributeError) { Topic.select(:id).find(topic.id).content }
+  ensure
+    ActiveRecord::Base.time_zone_aware_attributes = false
+  end
+
   def test_quote
     author_name = "\\ \001 ' \n \\n \""
     topic = Topic.create('author_name' => author_name)