Merge "Avoid raw sql in LocalFileDeleteBatch::doDBInserts"