TEIID-3136 fully resolving to ensure the metadata is correct