TEIID-2502 adding struct retrieval handling