Do not override the query_spec if it has already been specified
Quote column names in constraints