Merge pull request #15561 from sgrif/sg-time-zone-aware-arrays

Ensure time zones don't change after round trip with array columns

2 files changed, 13 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
index 44a679a550..c1c3987cf5 100644
--- a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
+++ b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
@@ -10,7 +10,17 @@ module ActiveRecord
 
         def type_cast(value)
           value = @column.type_cast(value)
-          value.acts_like?(:time) ? value.in_time_zone : value
+          convert_value_to_time_zone(value)
+        end
+
+        def convert_value_to_time_zone(value)
+          if value.is_a?(Array)
+            value.map { |v| convert_value_to_time_zone(v) }
+          elsif value.acts_like?(:time)
+            value.in_time_zone
+          else
+            value
+          end
         end
       end
 
diff --git a/activerecord/test/cases/adapters/postgresql/array_test.rb b/activerecord/test/cases/adapters/postgresql/array_test.rb
index c78c502478..1d431f1666 100644
--- a/activerecord/test/cases/adapters/postgresql/array_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/array_test.rb
@@ -208,11 +208,13 @@ class PostgresqlArrayTest < ActiveRecord::TestCase
 
       record = PgArray.new(datetimes: [time_string])
       assert_equal [time], record.datetimes
+      assert_equal ActiveSupport::TimeZone[tz], record.datetimes.first.time_zone
 
       record.save!
       record.reload
 
       assert_equal [time], record.datetimes
+      assert_equal ActiveSupport::TimeZone[tz], record.datetimes.first.time_zone
     end
   end