Merge pull request rails#49738 from fatkodima/avoid-unneeded-queries-…

…in-delete

Ignore invalid PRIMARY KEY values in `ActiveRecord::Persistence.delete` method

activerecord/lib/active_record/persistence.rb

@@ -563,6 +563,8 @@ def destroy(id)
       #   # Delete multiple rows
       #   Todo.delete([2,3,4])
       def delete(id_or_array)
+        return 0 if id_or_array.nil? || (id_or_array.is_a?(Array) && id_or_array.empty?)
+
         delete_by(primary_key => id_or_array)
       end
 

activerecord/test/cases/persistence_test.rb

@@ -1357,6 +1357,17 @@ def test_class_level_delete
     assert_nothing_raised { Reply.find(should_not_be_destroyed_reply.id) }
   end
 
+  def test_class_level_delete_with_invalid_ids
+    assert_no_queries do
+      assert_equal 0, Topic.delete(nil)
+      assert_equal 0, Topic.delete([])
+    end
+
+    assert_difference -> { Topic.count }, -1 do
+      assert_equal 1, Topic.delete(topics(:first).id)
+    end
+  end
+
   def test_class_level_delete_is_affected_by_scoping
     should_not_be_destroyed_reply = Reply.create("title" => "hello", "content" => "world")
     Topic.find(1).replies << should_not_be_destroyed_reply