3.0 - Select and Subquery strategy for HasOne

This brings HasOne up to speed with the rest of the associations