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

Add array support when time zone aware attributes are enabled

1 files changed, 16 insertions, 0 deletions

diff --git a/activerecord/test/cases/adapters/postgresql/array_test.rb b/activerecord/test/cases/adapters/postgresql/array_test.rb
index e03d83df59..90b72563fa 100644
--- a/activerecord/test/cases/adapters/postgresql/array_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/array_test.rb
@@ -12,6 +12,7 @@ class PostgresqlArrayTest < ActiveRecord::TestCase
       @connection.create_table('pg_arrays') do |t|
         t.string 'tags', array: true
         t.integer 'ratings', array: true
+        t.datetime :datetimes, array: true
       end
     end
     @column = PgArray.columns_hash['tags']
@@ -195,6 +196,21 @@ class PostgresqlArrayTest < ActiveRecord::TestCase
     assert_equal tags, ar.tags
   end
 
+  def test_datetime_with_timezone_awareness
+    with_timezone_config aware_attributes: true do
+      PgArray.reset_column_information
+      current_time = [Time.current]
+
+      record = PgArray.new(datetimes: current_time)
+      assert_equal current_time, record.datetimes
+
+      record.save!
+      record.reload
+
+      assert_equal current_time, record.datetimes
+    end
+  end
+
   private
   def assert_cycle field, array
     # test creation