Nice!

There's also another place where this would come in handy, and I'd like to be able to handle it. I can't quite remember where though. I'll try to track it down.

I'm pretty sure it's when you're within a query already somewhere and a certain clause would trigger no results, so avoiding an actual query would be good there. 🤔

It would be good to nail the pattern first before rolling it out to other places.

Ah, it's here:

@jasonvarga I don't love it, but this gets around it being inside a where function clause.

Though returning the empty builder isnt even needed, it could just not do the orWhere() entirely

Always happy to make it better.

I've refactored it to have a base EmptyQueryBuilder with a new EmptyEntryQueryBuilder which implements Statamic\Contracts\Entries\QueryBuilder. For completeness I've also ensured the EmptyEntryQueryBuilder supports the taxonomy where clauses, though as no results are returned it doesn't actually do anything.

Happy to move to a trait if you think thats better, but the EmptyQueryBuilder class might be useful in and of itself.

I apologize for being persistent, but I need to launch a website for a major regional bank next week. Will the PR be completed by then, or should I proceed with refactoring the code?

Sorry but we can't promise an ETA unfortunately.

You might be able to workaround it by overriding Statamic\Fieldtypes\Entries and add an early return to the augment method between these lines.

Something like

if (empty($values)) {
    return null;
}