Add 'from' clause to query.peg