Merge branch 'master' into adequaterecord

* master:
  Revert "Merge pull request #13344 from ccutrer/fix-from-default-select"
  No need to use symbols
  Don't skip tests if they are not broken. Just don't define they
  Fix typo [ci skip]
  Resolve encoding issues with arrays of hstore (bug 11135).
  Fix coffeescript sample [ci skip]

1 files changed, 39 insertions, 0 deletions

diff --git a/activerecord/test/cases/adapters/postgresql/hstore_test.rb b/activerecord/test/cases/adapters/postgresql/hstore_test.rb
index d8782f5eaa..f2502430de 100644
--- a/activerecord/test/cases/adapters/postgresql/hstore_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/hstore_test.rb
@@ -24,6 +24,7 @@ class PostgresqlHstoreTest < ActiveRecord::TestCase
     @connection.transaction do
       @connection.create_table('hstores') do |t|
         t.hstore 'tags', :default => ''
+        t.hstore 'payload', array: true
         t.hstore 'settings'
       end
     end
@@ -182,6 +183,30 @@ class PostgresqlHstoreTest < ActiveRecord::TestCase
       assert_equal({'1' => '2'}, x.tags)
     end
 
+    def test_array_cycle
+      assert_array_cycle([{"AA" => "BB", "CC" => "DD"}, {"AA" => nil}])
+    end
+
+    def test_array_strings_with_quotes
+      assert_array_cycle([{'this has' => 'some "s that need to be escaped"'}])
+    end
+
+    def test_array_strings_with_commas
+      assert_array_cycle([{'this,has' => 'many,values'}])
+    end
+
+    def test_array_strings_with_array_delimiters
+      assert_array_cycle(['{' => '}'])
+    end
+
+    def test_array_strings_with_null_strings
+      assert_array_cycle([{'NULL' => 'NULL'}])
+    end
+
+    def test_contains_nils
+      assert_array_cycle([{'NULL' => nil}])
+    end
+
     def test_select_multikey
       @connection.execute "insert into hstores (tags) VALUES ('1=>2,2=>3')"
       x = Hstore.first
@@ -237,6 +262,20 @@ class PostgresqlHstoreTest < ActiveRecord::TestCase
 
   private
 
+    def assert_array_cycle(array)
+      # test creation
+      x = Hstore.create!(payload: array)
+      x.reload
+      assert_equal(array, x.payload)
+
+      # test updating
+      x = Hstore.create!(payload: [])
+      x.payload = array
+      x.save!
+      x.reload
+      assert_equal(array, x.payload)
+    end
+
     def assert_cycle(hash)
       # test creation
       x = Hstore.create!(:tags => hash)