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

1 files changed, 96 insertions, 22 deletions

diff --git a/activerecord/test/cases/timestamp_test.rb b/activerecord/test/cases/timestamp_test.rb
index ff1b01556d..717e0e1866 100644
--- a/activerecord/test/cases/timestamp_test.rb
+++ b/activerecord/test/cases/timestamp_test.rb
@@ -11,6 +11,7 @@ class TimestampTest < ActiveRecord::TestCase
 
   def setup
     @developer = Developer.first
+    @owner = Owner.first
     @developer.update_columns(updated_at: Time.now.prev_month)
     @previously_updated_at = @developer.updated_at
   end
@@ -92,6 +93,53 @@ class TimestampTest < ActiveRecord::TestCase
     assert_nothing_raised { Car.first.touch }
   end
 
+  def test_touching_a_no_touching_object
+    Developer.no_touching do
+      assert @developer.no_touching?
+      assert !@owner.no_touching?
+      @developer.touch
+    end
+
+    assert !@developer.no_touching?
+    assert !@owner.no_touching?
+    assert_equal @previously_updated_at, @developer.updated_at
+  end
+
+  def test_touching_related_objects
+    @owner = Owner.first
+    @previously_updated_at = @owner.updated_at
+
+    Owner.no_touching do
+      @owner.pets.first.touch
+    end
+
+    assert_equal @previously_updated_at, @owner.updated_at
+  end
+
+  def test_global_no_touching
+    ActiveRecord::Base.no_touching do
+      assert @developer.no_touching?
+      assert @owner.no_touching?
+      @developer.touch
+    end
+
+    assert !@developer.no_touching?
+    assert !@owner.no_touching?
+    assert_equal @previously_updated_at, @developer.updated_at
+  end
+
+  def test_no_touching_threadsafe
+    Thread.new do
+      Developer.no_touching do
+        assert @developer.no_touching?
+
+        sleep(1)
+      end
+    end
+
+    assert !@developer.no_touching?
+  end
+
   def test_saving_a_record_with_a_belongs_to_that_specifies_touching_the_parent_should_update_the_parent_updated_at
     pet   = Pet.first
     owner = pet.owner
@@ -224,36 +272,62 @@ class TimestampTest < ActiveRecord::TestCase
     assert_not_equal time, old_pet.updated_at
   end
 
-  def test_changing_parent_of_a_record_touches_both_new_and_old_polymorphic_parent_record
-    klass = Class.new(ActiveRecord::Base) do
-      def self.name; 'Toy'; end
+  def test_changing_parent_of_a_record_touches_both_new_and_old_polymorphic_parent_record_changes_within_same_class
+    car_class = Class.new(ActiveRecord::Base) do
+      def self.name; 'Car'; end
     end
 
-    wheel_klass = Class.new(ActiveRecord::Base) do
+    wheel_class = Class.new(ActiveRecord::Base) do
       def self.name; 'Wheel'; end
       belongs_to :wheelable, :polymorphic => true, :touch => true
     end
 
-    toy1 = klass.find(1)
-    toy2 = klass.find(2)
+    car1 = car_class.find(1)
+    car2 = car_class.find(2)
 
-    wheel = wheel_klass.new
-    wheel.wheelable = toy1
-    wheel.save!
+    wheel = wheel_class.create!(wheelable: car1)
 
     time = 3.days.ago.at_beginning_of_hour
 
-    toy1.update_columns(updated_at: time)
-    toy2.update_columns(updated_at: time)
+    car1.update_columns(updated_at: time)
+    car2.update_columns(updated_at: time)
 
-    wheel.wheelable = toy2
+    wheel.wheelable = car2
     wheel.save!
 
-    toy1.reload
-    toy2.reload
+    assert_not_equal time, car1.reload.updated_at
+    assert_not_equal time, car2.reload.updated_at
+  end
+
+  def test_changing_parent_of_a_record_touches_both_new_and_old_polymorphic_parent_record_changes_with_other_class
+    car_class = Class.new(ActiveRecord::Base) do
+      def self.name; 'Car'; end
+    end
+
+    toy_class = Class.new(ActiveRecord::Base) do
+      def self.name; 'Toy'; end
+    end
+
+    wheel_class = Class.new(ActiveRecord::Base) do
+      def self.name; 'Wheel'; end
+      belongs_to :wheelable, :polymorphic => true, :touch => true
+    end
+
+    car = car_class.find(1)
+    toy = toy_class.find(3)
+
+    wheel = wheel_class.create!(wheelable: car)
+
+    time = 3.days.ago.at_beginning_of_hour
+
+    car.update_columns(updated_at: time)
+    toy.update_columns(updated_at: time)
+
+    wheel.wheelable = toy
+    wheel.save!
 
-    assert_not_equal time, toy1.updated_at
-    assert_not_equal time, toy2.updated_at
+    assert_not_equal time, car.reload.updated_at
+    assert_not_equal time, toy.reload.updated_at
   end
 
   def test_clearing_association_touches_the_old_record
@@ -278,31 +352,31 @@ class TimestampTest < ActiveRecord::TestCase
 
   def test_timestamp_attributes_for_create
     toy = Toy.first
-    assert_equal toy.send(:timestamp_attributes_for_create), [:created_at, :created_on]
+    assert_equal [:created_at, :created_on], toy.send(:timestamp_attributes_for_create)
   end
 
   def test_timestamp_attributes_for_update
     toy = Toy.first
-    assert_equal toy.send(:timestamp_attributes_for_update), [:updated_at, :updated_on]
+    assert_equal [:updated_at, :updated_on], toy.send(:timestamp_attributes_for_update)
   end
 
   def test_all_timestamp_attributes
     toy = Toy.first
-    assert_equal toy.send(:all_timestamp_attributes), [:created_at, :created_on, :updated_at, :updated_on]
+    assert_equal [:created_at, :created_on, :updated_at, :updated_on], toy.send(:all_timestamp_attributes)
   end
 
   def test_timestamp_attributes_for_create_in_model
     toy = Toy.first
-    assert_equal toy.send(:timestamp_attributes_for_create_in_model), [:created_at]
+    assert_equal [:created_at], toy.send(:timestamp_attributes_for_create_in_model)
   end
 
   def test_timestamp_attributes_for_update_in_model
     toy = Toy.first
-    assert_equal toy.send(:timestamp_attributes_for_update_in_model), [:updated_at]
+    assert_equal [:updated_at], toy.send(:timestamp_attributes_for_update_in_model)
   end
 
   def test_all_timestamp_attributes_in_model
     toy = Toy.first
-    assert_equal toy.send(:all_timestamp_attributes_in_model), [:created_at, :updated_at]
+    assert_equal [:created_at, :updated_at], toy.send(:all_timestamp_attributes_in_model)
   end
 end