properly handle the `WITH` clauses in operations

[tshprecher]

The script to generate psql tests has a hack to support queries starting with WITH, but WITH is not a type of query. We should be smarter about how we slot queries by properly slotting SELECT, UPDATE, etc... queries with a WITH statement.