The Arizona Diamondbacks have agreed to terms with infielder John McDonald on a two-year contract, club president Kevin Towers announced on Wednesday.