Fix some issues and reenable the related test cases.
Implement a SQLString collector.