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]

4 files changed, 50 insertions, 12 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)
diff --git a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
index 4f6c85c6c9..0a52bc6e6a 100644
--- a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
@@ -33,9 +33,8 @@ module ActiveRecord
         end
       end
 
-      def test_connect_with_url
-        skip "can't establish new connection when using memory db" if in_memory_db?
-        begin
+      unless in_memory_db?
+        def test_connect_with_url
           original_connection = ActiveRecord::Base.remove_connection
           tf = Tempfile.open 'whatever'
           url = "sqlite3://#{tf.path}"
@@ -46,11 +45,8 @@ module ActiveRecord
           tf.unlink
           ActiveRecord::Base.establish_connection(original_connection)
         end
-      end
 
-      def test_connect_memory_with_url
-        skip "can't establish new connection when using memory db" if in_memory_db?
-        begin
+        def test_connect_memory_with_url
           original_connection = ActiveRecord::Base.remove_connection
           url = "sqlite3:///:memory:"
           ActiveRecord::Base.establish_connection(url)
diff --git a/activerecord/test/cases/associations/eager_singularization_test.rb b/activerecord/test/cases/associations/eager_singularization_test.rb
index 669569a774..b12bc355e8 100644
--- a/activerecord/test/cases/associations/eager_singularization_test.rb
+++ b/activerecord/test/cases/associations/eager_singularization_test.rb
@@ -1,6 +1,7 @@
 require "cases/helper"
 
 
+if ActiveRecord::Base.connection.supports_migrations?
 class EagerSingularizationTest < ActiveRecord::TestCase
   class Virus < ActiveRecord::Base
     belongs_to :octopus
@@ -50,8 +51,6 @@ class EagerSingularizationTest < ActiveRecord::TestCase
   end
 
   def setup
-    skip 'Does not support migrations' unless connection.supports_migrations?
-
     connection.create_table :viri do |t|
       t.column :octopus_id, :integer
       t.column :species, :string
@@ -146,3 +145,4 @@ class EagerSingularizationTest < ActiveRecord::TestCase
     end
   end
 end
+end
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index f45b578c0f..21d05e4ac0 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -151,11 +151,14 @@ class RelationTest < ActiveRecord::TestCase
     assert_equal relation.to_a, Comment.select('a.*').from(relation, :a).to_a
   end
 
-  def test_finding_with_subquery_without_select
-    relation = Topic.where(:approved => true)
-    assert_equal relation.to_a, Topic.from(relation).to_a
+  def test_finding_with_subquery_without_select_does_not_change_the_select
+    relation = Topic.where(approved: true)
+    assert_raises(ActiveRecord::StatementInvalid) do
+      Topic.from(relation).to_a
+    end
   end
 
+
   def test_finding_with_conditions
     assert_equal ["David"], Author.where(:name => 'David').map(&:name)
     assert_equal ['Mary'],  Author.where(["name = ?", 'Mary']).map(&:name)