Revert "Merge pull request #19783 from vngrs/raise_error_on_touch_if_…

…object_is_stale"

This reverts commit 3036490.

Reason: It brokes some tests with has_one association what can cause an
regression

activerecord/lib/active_record/persistence.rb

@@ -466,23 +466,11 @@ def touch(*names)
           changes[column] = write_attribute(column, current_time)
         end
 
+        changes[self.class.locking_column] = increment_lock if locking_enabled?
+
         clear_attribute_changes(changes.keys)
         primary_key = self.class.primary_key
-        scope = self.class.unscoped.where(primary_key => _read_attribute(primary_key))
-
-        if locking_enabled?
-          locking_column = self.class.locking_column
-          scope = scope.where(locking_column => _read_attribute(locking_column))
-          changes[locking_column] = increment_lock
-        end
-
-        result = scope.update_all(changes) == 1
-
-        if !result && locking_enabled?
-          raise ActiveRecord::StaleObjectError.new(self, "touch")
-        end
-
-        result
+        self.class.unscoped.where(primary_key => self[primary_key]).update_all(changes) == 1
       else
         true
       end

activerecord/test/cases/locking_test.rb

@@ -177,16 +177,6 @@ def test_touch_existing_lock
     assert_equal 1, p1.lock_version
   end
 
-  def test_touch_stale_object
-    person = Person.create!(first_name: 'Mehmet Emin')
-    stale_person = Person.find(person.id)
-    person.update_attribute(:gender, 'M')
-
-    assert_raises(ActiveRecord::StaleObjectError) do
-      stale_person.touch
-    end
-  end
-
   def test_lock_column_name_existing
     t1 = LegacyThing.find(1)
     t2 = LegacyThing.find(1)