TAJO-1109: Separate SQL Statements from Catalog Stores