[5.x] Ensure no queries are run when entries field has no values

src/Exceptions/InvalidQueryDateException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Statamic\Exceptions;
+
+class InvalidQueryDateException extends \Exception
+{
+}

src/Fieldtypes/Entries.php

@@ -18,6 +18,7 @@
 use Statamic\Facades\User;
 use Statamic\Http\Resources\CP\Entries\EntriesFieldtypeEntries;
 use Statamic\Http\Resources\CP\Entries\EntriesFieldtypeEntry as EntryResource;
+use Statamic\Query\EmptyQueryBuilder;
 use Statamic\Query\OrderedQueryBuilder;
 use Statamic\Query\Scopes\Filter;
 use Statamic\Query\Scopes\Filters\Concerns\QueriesFilters;
@@ -337,6 +338,10 @@ protected function collect($value)
 
     private function queryBuilder($values)
     {
+        if (! $values) {
+            return new StatusQueryBuilder(new EmptyQueryBuilder());
+        }
+
         $site = Site::current()->handle();
         if (($parent = $this->field()->parent()) && $parent instanceof Localization) {
             $site = $parent->locale();

src/Query/EmptyQueryBuilder.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Statamic\Query;
+
+class EmptyQueryBuilder extends IteratorBuilder
+{
+    protected function getBaseItems()
+    {
+        return collect([]);
+    }
+
+    public function whereStatus($status)
+    {
+        return $this;
+    }
+}

src/Stache/Query/QueriesEntryStatus.php

@@ -3,6 +3,8 @@
 namespace Statamic\Stache\Query;
 
 use Illuminate\Support\Collection;
+use Statamic\Exceptions\InvalidQueryDateException;
+use Statamic\Query\EmptyQueryBuilder;
 
 trait QueriesEntryStatus
 {
@@ -26,7 +28,14 @@ public function whereStatus(string $status)
 
         return $this->where(fn ($query) => $this
             ->getCollectionsForStatusQuery()
-            ->each(fn ($collection) => $query->orWhere(fn ($q) => $this->addCollectionStatusLogicToQuery($q, $status, $collection))));
+            ->each(function ($collection) use ($query, $status) {
+                try {
+                    return $query->orWhere(fn ($q) => $this->addCollectionStatusLogicToQuery($q, $status, $collection));
+                } catch (InvalidQueryDateException $e) {
+                    return new EmptyQueryBuilder();
+                }
+            })
+        );
     }
 
     private function addCollectionStatusLogicToQuery($query, $status, $collection): void
@@ -35,7 +44,7 @@ private function addCollectionStatusLogicToQuery($query, $status, $collection):
 
         if (! $collection->dated() || ($collection->futureDateBehavior() === 'public' && $collection->pastDateBehavior() === 'public')) {
             if ($status === 'scheduled' || $status === 'expired') {
-                $query->where('date', 'invalid'); // intentionally trigger no results.
+                throw new InvalidQueryDateException(); // intentionally trigger no results.
             }
 
             return;
@@ -47,7 +56,7 @@ private function addCollectionStatusLogicToQuery($query, $status, $collection):
                 : $query->where('date', '<', now());
 
             if ($status === 'expired') {
-                $query->where('date', 'invalid'); // intentionally trigger no results.
+                throw new InvalidQueryDateException(); // intentionally trigger no results.
             }
         }
 
@@ -57,7 +66,7 @@ private function addCollectionStatusLogicToQuery($query, $status, $collection):
                 : $query->where('date', '>', now());
 
             if ($status === 'scheduled') {
-                $query->where('date', 'invalid'); // intentionally trigger no results.
+                throw new InvalidQueryDateException(); // intentionally trigger no results.
             }
         }
     }

tests/Fieldtypes/EntriesTest.php

@@ -82,6 +82,11 @@ public function it_augments_to_a_query_builder_when_theres_no_value()
 
         $this->assertInstanceOf(Builder::class, $augmented);
         $this->assertCount(0, $augmented->get());
+
+        $augmented = $this->fieldtype()->augment([]);
+
+        $this->assertInstanceOf(Builder::class, $augmented);
+        $this->assertCount(0, $augmented->get());
     }
 
     #[Test]