TEIID-1070 more for simpledb