1 files changed, 72 insertions, 24 deletions

diff --git a/activerecord/test/cases/adapters/postgresql/array_test.rb b/activerecord/test/cases/adapters/postgresql/array_test.rb
index 18dd4a6de8..0b1e3295cc 100644
--- a/activerecord/test/cases/adapters/postgresql/array_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/array_test.rb
@@ -1,9 +1,9 @@
 # encoding: utf-8
 require "cases/helper"
-require 'active_record/base'
-require 'active_record/connection_adapters/postgresql_adapter'
 
 class PostgresqlArrayTest < ActiveRecord::TestCase
+  include InTimeZone
+
   class PgArray < ActiveRecord::Base
     self.table_name = 'pg_arrays'
   end
@@ -14,9 +14,10 @@ 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.find { |c| c.name == 'tags' }
+    @column = PgArray.columns_hash['tags']
   end
 
   teardown do
@@ -61,10 +62,10 @@ class PostgresqlArrayTest < ActiveRecord::TestCase
 
   def test_change_column_with_array
     @connection.add_column :pg_arrays, :snippets, :string, array: true, default: []
-    @connection.change_column :pg_arrays, :snippets, :text, array: true, default: "{}"
+    @connection.change_column :pg_arrays, :snippets, :text, array: true, default: []
 
     PgArray.reset_column_information
-    column = PgArray.columns.find { |c| c.name == 'snippets' }
+    column = PgArray.columns_hash['snippets']
 
     assert_equal :text, column.type
     assert_equal [], column.default
@@ -80,38 +81,57 @@ class PostgresqlArrayTest < ActiveRecord::TestCase
     end
   end
 
-  def test_type_cast_array
-    data = '{1,2,3}'
-    oid_type  = @column.instance_variable_get('@oid_type').subtype
-    # we are getting the instance variable in this test, but in the
-    # normal use of string_to_array, it's called from the OID::Array
-    # class and will have the OID instance that will provide the type
-    # casting
-    array = @column.class.string_to_array data, oid_type
-    assert_equal(['1', '2', '3'], array)
-    assert_equal(['1', '2', '3'], @column.type_cast(data))
+  def test_change_column_default_with_array
+    @connection.change_column_default :pg_arrays, :tags, []
 
-    assert_equal([], @column.type_cast('{}'))
-    assert_equal([nil], @column.type_cast('{NULL}'))
+    PgArray.reset_column_information
+    column = PgArray.columns_hash['tags']
+    assert_equal [], column.default
+  end
+
+  def test_type_cast_array
+    assert_equal(['1', '2', '3'], @column.type_cast_from_database('{1,2,3}'))
+    assert_equal([], @column.type_cast_from_database('{}'))
+    assert_equal([nil], @column.type_cast_from_database('{NULL}'))
   end
 
   def test_type_cast_integers
     x = PgArray.new(ratings: ['1', '2'])
-    assert x.save!
-    assert_equal(['1', '2'], x.ratings)
+
+    assert_equal([1, 2], x.ratings)
+
+    x.save!
+    x.reload
+
+    assert_equal([1, 2], x.ratings)
   end
 
-  def test_rewrite
+  def test_select_with_strings
     @connection.execute "insert into pg_arrays (tags) VALUES ('{1,2,3}')"
     x = PgArray.first
-    x.tags = ['1','2','3','4']
-    assert x.save!
+    assert_equal(['1','2','3'], x.tags)
   end
 
-  def test_select
+  def test_rewrite_with_strings
     @connection.execute "insert into pg_arrays (tags) VALUES ('{1,2,3}')"
     x = PgArray.first
-    assert_equal(['1','2','3'], x.tags)
+    x.tags = ['1','2','3','4']
+    x.save!
+    assert_equal ['1','2','3','4'], x.reload.tags
+  end
+
+  def test_select_with_integers
+    @connection.execute "insert into pg_arrays (ratings) VALUES ('{1,2,3}')"
+    x = PgArray.first
+    assert_equal([1, 2, 3], x.ratings)
+  end
+
+  def test_rewrite_with_integers
+    @connection.execute "insert into pg_arrays (ratings) VALUES ('{1,2,3}')"
+    x = PgArray.first
+    x.ratings = [2, '3', 4]
+    x.save!
+    assert_equal [2, 3, 4], x.reload.ratings
   end
 
   def test_multi_dimensional_with_strings
@@ -175,6 +195,34 @@ class PostgresqlArrayTest < ActiveRecord::TestCase
     assert_equal [], pg_array.reload.tags
   end
 
+  def test_escaping
+    unknown = 'foo\\",bar,baz,\\'
+    tags = ["hello_#{unknown}"]
+    ar = PgArray.create!(tags: tags)
+    ar.reload
+    assert_equal tags, ar.tags
+  end
+
+  def test_datetime_with_timezone_awareness
+    tz = "Pacific Time (US & Canada)"
+
+    in_time_zone tz do
+      PgArray.reset_column_information
+      time_string = Time.current.to_s
+      time = Time.zone.parse(time_string)
+
+      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
+
   private
   def assert_cycle field, array
     # test creation