Is this so that the UPSERT SELECT populates the tenantId column? Would it possibly already be there, or would the idea be that you'd never refer to the tenantId column in a query explicitly? If that's the case, do we enforce that (or maybe that's one of the bugs that's open?)?