Merge branch 'master' into set_binds

* master: (2794 commits)
  doc, API example on how to use `Model#exists?` with multiple IDs. [ci skip]
  Restore DATABASE_URL even if it's nil in connection_handler test
  [ci skip] - error_messages_for has been deprecated since 2.3.8 - lets reduce any confusion for users
  Ensure Active Record connection consistency
  Revert "ask the fixture set for the sql statements"
  Check `respond_to` before delegation due to: https://github.com/ruby/ruby/commit/d781caaf313b8649948c107bba277e5ad7307314
  Adding Hash#compact and Hash#compact! methods
  MySQL version 4.1 was EOL on December 31, 2009 We should at least recommend modern versions of MySQL to users.
  clear cache on body close so that cache remains during rendering
  add a more restricted codepath for templates fixes #13390
  refactor generator tests to use block form of Tempfile
  Fix typo [ci skip]
  Move finish_template as the last public method in the generator
  Minor typos fix [ci skip]
  make `change_column_null` reversible. Closes #13576.
  create/drop test and development databases only if RAILS_ENV is nil
  Revert "Speedup String#to"
  typo fix in test name. [ci skip].
  `core_ext/string/access.rb` test what we are documenting.
  Fix typo in image_tag documentation
  ...

Conflicts:
	activerecord/lib/active_record/associations/join_dependency/join_association.rb
	activerecord/lib/active_record/relation/query_methods.rb

4 files changed, 97 insertions, 57 deletions

diff --git a/activerecord/test/cases/validations/association_validation_test.rb b/activerecord/test/cases/validations/association_validation_test.rb
index 7ac34bc71e..602f633c45 100644
--- a/activerecord/test/cases/validations/association_validation_test.rb
+++ b/activerecord/test/cases/validations/association_validation_test.rb
@@ -10,29 +10,33 @@ require 'models/interest'
 class AssociationValidationTest < ActiveRecord::TestCase
   fixtures :topics, :owners
 
-  repair_validations(Topic, Reply, Owner)
+  repair_validations(Topic, Reply)
 
   def test_validates_size_of_association
-    assert_nothing_raised { Owner.validates_size_of :pets, :minimum => 1 }
-    o = Owner.new('name' => 'nopets')
-    assert !o.save
-    assert o.errors[:pets].any?
-    o.pets.build('name' => 'apet')
-    assert o.valid?
+    repair_validations Owner do
+      assert_nothing_raised { Owner.validates_size_of :pets, :minimum => 1 }
+      o = Owner.new('name' => 'nopets')
+      assert !o.save
+      assert o.errors[:pets].any?
+      o.pets.build('name' => 'apet')
+      assert o.valid?
+    end
   end
 
   def test_validates_size_of_association_using_within
-    assert_nothing_raised { Owner.validates_size_of :pets, :within => 1..2 }
-    o = Owner.new('name' => 'nopets')
-    assert !o.save
-    assert o.errors[:pets].any?
-
-    o.pets.build('name' => 'apet')
-    assert o.valid?
-
-    2.times { o.pets.build('name' => 'apet') }
-    assert !o.save
-    assert o.errors[:pets].any?
+    repair_validations Owner do
+      assert_nothing_raised { Owner.validates_size_of :pets, :within => 1..2 }
+      o = Owner.new('name' => 'nopets')
+      assert !o.save
+      assert o.errors[:pets].any?
+
+      o.pets.build('name' => 'apet')
+      assert o.valid?
+
+      2.times { o.pets.build('name' => 'apet') }
+      assert !o.save
+      assert o.errors[:pets].any?
+    end
   end
 
   def test_validates_associated_many
@@ -91,12 +95,14 @@ class AssociationValidationTest < ActiveRecord::TestCase
   end
 
   def test_validates_size_of_association_utf8
-    assert_nothing_raised { Owner.validates_size_of :pets, :minimum => 1 }
-    o = Owner.new('name' => 'あいうえおかきくけこ')
-    assert !o.save
-    assert o.errors[:pets].any?
-    o.pets.build('name' => 'あいうえおかきくけこ')
-    assert o.valid?
+    repair_validations Owner do
+      assert_nothing_raised { Owner.validates_size_of :pets, :minimum => 1 }
+      o = Owner.new('name' => 'あいうえおかきくけこ')
+      assert !o.save
+      assert o.errors[:pets].any?
+      o.pets.build('name' => 'あいうえおかきくけこ')
+      assert o.valid?
+    end
   end
 
   def test_validates_presence_of_belongs_to_association__parent_is_new_record
@@ -118,21 +124,4 @@ class AssociationValidationTest < ActiveRecord::TestCase
     end
   end
 
-  def test_validates_associated_models_in_the_same_context
-    Topic.validates_presence_of :title, :on => :custom_context
-    Topic.validates_associated :replies
-    Reply.validates_presence_of :title, :on => :custom_context
-
-    t = Topic.new('title' => '')
-    r = t.replies.new('title' => '')
-
-    assert t.valid?
-    assert !t.valid?(:custom_context)
-
-    t.title = "Longer"
-    assert !t.valid?(:custom_context), "Should NOT be valid if the associated object is not valid in the same context."
-
-    r.title = "Longer"
-    assert t.valid?(:custom_context), "Should be valid if the associated object is not valid in the same context."
-  end
 end
diff --git a/activerecord/test/cases/validations/i18n_generate_message_validation_test.rb b/activerecord/test/cases/validations/i18n_generate_message_validation_test.rb
index 32d2bf746f..a73c3bf1af 100644
--- a/activerecord/test/cases/validations/i18n_generate_message_validation_test.rb
+++ b/activerecord/test/cases/validations/i18n_generate_message_validation_test.rb
@@ -55,22 +55,30 @@ class I18nGenerateMessageValidationTest < ActiveRecord::TestCase
   end
 
   test "translation for 'taken' can be overridden" do
-    I18n.backend.store_translations "en", {errors: {attributes: {title: {taken: "Custom taken message" }}}}
-    assert_equal "Custom taken message", @topic.errors.generate_message(:title, :taken, :value => 'title')
+    reset_i18n_load_path do
+      I18n.backend.store_translations "en", {errors: {attributes: {title: {taken: "Custom taken message" }}}}
+      assert_equal "Custom taken message", @topic.errors.generate_message(:title, :taken, :value => 'title')
+    end
   end
 
   test "translation for 'taken' can be overridden in activerecord scope" do
-    I18n.backend.store_translations "en", {activerecord: {errors: {messages: {taken: "Custom taken message" }}}}
-    assert_equal "Custom taken message", @topic.errors.generate_message(:title, :taken, :value => 'title')
+    reset_i18n_load_path do
+      I18n.backend.store_translations "en", {activerecord: {errors: {messages: {taken: "Custom taken message" }}}}
+      assert_equal "Custom taken message", @topic.errors.generate_message(:title, :taken, :value => 'title')
+    end
   end
 
   test "translation for 'taken' can be overridden in activerecord model scope" do
-    I18n.backend.store_translations "en", {activerecord: {errors: {models: {topic: {taken: "Custom taken message" }}}}}
-    assert_equal "Custom taken message", @topic.errors.generate_message(:title, :taken, :value => 'title')
+    reset_i18n_load_path do
+      I18n.backend.store_translations "en", {activerecord: {errors: {models: {topic: {taken: "Custom taken message" }}}}}
+      assert_equal "Custom taken message", @topic.errors.generate_message(:title, :taken, :value => 'title')
+    end
   end
 
   test "translation for 'taken' can be overridden in activerecord attributes scope" do
-    I18n.backend.store_translations "en", {activerecord: {errors: {models: {topic: {attributes: {title: {taken: "Custom taken message" }}}}}}}
-    assert_equal "Custom taken message", @topic.errors.generate_message(:title, :taken, :value => 'title')
+    reset_i18n_load_path do
+      I18n.backend.store_translations "en", {activerecord: {errors: {models: {topic: {attributes: {title: {taken: "Custom taken message" }}}}}}}
+      assert_equal "Custom taken message", @topic.errors.generate_message(:title, :taken, :value => 'title')
+    end
   end
 end
diff --git a/activerecord/test/cases/validations/presence_validation_test.rb b/activerecord/test/cases/validations/presence_validation_test.rb
index 1de8934406..3790d3c8cf 100644
--- a/activerecord/test/cases/validations/presence_validation_test.rb
+++ b/activerecord/test/cases/validations/presence_validation_test.rb
@@ -3,6 +3,8 @@ require "cases/helper"
 require 'models/man'
 require 'models/face'
 require 'models/interest'
+require 'models/speedometer'
+require 'models/dashboard'
 
 class PresenceValidationTest < ActiveRecord::TestCase
   class Boy < Man; end
@@ -48,4 +50,18 @@ class PresenceValidationTest < ActiveRecord::TestCase
     i2.mark_for_destruction
     assert b.invalid?
   end
+
+  def test_validates_presence_doesnt_convert_to_array
+    Speedometer.validates_presence_of :dashboard
+
+    dash = Dashboard.new
+
+    # dashboard has to_a method
+    def dash.to_a; ['(/)', '(\)']; end
+
+    s = Speedometer.new
+    s.dashboard = dash
+
+    assert_nothing_raised { s.valid? }
+  end
 end
diff --git a/activerecord/test/cases/validations/uniqueness_validation_test.rb b/activerecord/test/cases/validations/uniqueness_validation_test.rb
index 2b33f01783..74c696c858 100644
--- a/activerecord/test/cases/validations/uniqueness_validation_test.rb
+++ b/activerecord/test/cases/validations/uniqueness_validation_test.rb
@@ -35,6 +35,11 @@ class Employee < ActiveRecord::Base
   validates_uniqueness_of :nicknames
 end
 
+class TopicWithUniqEvent < Topic
+  belongs_to :event, foreign_key: :parent_id
+  validates :event, uniqueness: true
+end
+
 class UniquenessValidationTest < ActiveRecord::TestCase
   fixtures :topics, 'warehouse-things', :developers
 
@@ -58,6 +63,14 @@ class UniquenessValidationTest < ActiveRecord::TestCase
     assert t2.save, "Should now save t2 as unique"
   end
 
+  def test_validate_uniqueness_with_alias_attribute
+    Topic.alias_attribute :new_title, :title
+    Topic.validates_uniqueness_of(:new_title)
+
+    topic = Topic.new(new_title: 'abc')
+    assert topic.valid?
+  end
+
   def test_validates_uniqueness_with_nil_value
     Topic.validates_uniqueness_of(:title)
 
@@ -365,15 +378,29 @@ class UniquenessValidationTest < ActiveRecord::TestCase
     }
   end
 
-  def test_validate_uniqueness_with_array_column
-    return skip "Uniqueness on arrays has only been tested in PostgreSQL so far." if !current_adapter? :PostgreSQLAdapter
+  if current_adapter? :PostgreSQLAdapter
+    def test_validate_uniqueness_with_array_column
+      e1 = Employee.create("nicknames" => ["john", "johnny"], "commission_by_quarter" => [1000, 1200])
+      assert e1.persisted?, "Saving e1"
 
-    e1 = Employee.create("nicknames" => ["john", "johnny"], "commission_by_quarter" => [1000, 1200])
-    assert e1.persisted?, "Saving e1"
+      e2 = Employee.create("nicknames" => ["john", "johnny"], "commission_by_quarter" => [2200])
+      assert !e2.persisted?, "e2 shouldn't be valid"
+      assert e2.errors[:nicknames].any?, "Should have errors for nicknames"
+      assert_equal ["has already been taken"], e2.errors[:nicknames], "Should have uniqueness message for nicknames"
+    end
+  end
+
+  def test_validate_uniqueness_on_existing_relation
+    event = Event.create
+    assert TopicWithUniqEvent.create(event: event).valid?
+
+    topic = TopicWithUniqEvent.new(event: event)
+    assert_not topic.valid?
+    assert_equal ['has already been taken'], topic.errors[:event]
+  end
 
-    e2 = Employee.create("nicknames" => ["john", "johnny"], "commission_by_quarter" => [2200])
-    assert !e2.persisted?, "e2 shouldn't be valid"
-    assert e2.errors[:nicknames].any?, "Should have errors for nicknames"
-    assert_equal ["has already been taken"], e2.errors[:nicknames], "Should have uniqueness message for nicknames"
+  def test_validate_uniqueness_on_empty_relation
+    topic = TopicWithUniqEvent.new
+    assert topic.valid?
   end
 end