Tightened a safety check so it can't be quietly bypassed

A protective test and the scaffolding it relies on disagreed about what counts as the same database query, which meant a routine formatting change could have disabled the check without anything failing. They now share one definition, and the check covers both ways the query can be issued.