Merge "check for SELECT statements in query"