[6.x] Respect field defaults when resolving queryable values

src/Assets/Asset.php

@@ -1147,7 +1147,7 @@ public function getQueryableValue(string $field)
             return $value;
         }
 
-        return $field->fieldtype()->toQueryableValue($value);
+        return $field->toQueryableValue($value);
     }
 
     private function queryableMethods(): array

src/Auth/User.php

@@ -488,7 +488,7 @@ public function getQueryableValue(string $field)
             return $value;
         }
 
-        return $field->fieldtype()->toQueryableValue($value);
+        return $field->toQueryableValue($value);
     }
 
     private function queryableMethods(): array

src/Entries/Entry.php

@@ -1176,7 +1176,7 @@ public function getQueryableValue(string $field)
             return $value;
         }
 
-        return $field->fieldtype()->toQueryableValue($value);
+        return $field->toQueryableValue($value);
     }
 
     private function queryableMethods(): array

src/Fields/Field.php

@@ -308,6 +308,15 @@ public function defaultValue()
         return $this->config['default'] ?? $this->fieldtype()->defaultValue();
     }
 
+    public function toQueryableValue($value)
+    {
+        if ($value === null && ! $this->hasComputedDefault()) {
+            $value = $this->defaultValue();
+        }
+
+        return $this->fieldtype()->toQueryableValue($value);
+    }
+
     public function hasComputedDefault(): bool
     {
         if (! isset($this->config['default'])) {

src/Forms/Form.php

@@ -462,7 +462,7 @@ public function getQueryableValue(string $field)
             return $value;
         }
 
-        return $field->fieldtype()->toQueryableValue($value);
+        return $field->toQueryableValue($value);
     }
 
     private function queryableMethods(): array

src/Forms/Submission.php

@@ -278,7 +278,7 @@ public function getQueryableValue(string $field)
             return $value;
         }
 
-        return $field->fieldtype()->toQueryableValue($value);
+        return $field->toQueryableValue($value);
     }
 
     private function queryableMethods(): array

src/Globals/Variables.php

@@ -304,7 +304,7 @@ public function getQueryableValue(string $field)
             return $value;
         }
 
-        return $field->fieldtype()->toQueryableValue($value);
+        return $field->toQueryableValue($value);
     }
 
     private function queryableMethods(): array

src/Taxonomies/LocalizedTerm.php

@@ -495,7 +495,7 @@ public function getQueryableValue(string $field)
             return $value;
         }
 
-        return $field->fieldtype()->toQueryableValue($value);
+        return $field->toQueryableValue($value);
     }
 
     private function queryableMethods(): array

tests/Fields/FieldTest.php

@@ -699,4 +699,32 @@ public function it_gets_and_sets_the_form()
         $this->assertEquals($field, $return);
         $this->assertEquals($form, $field->form());
     }
+
+    #[Test]
+    public function it_uses_the_default_when_converting_a_null_value_to_a_queryable_value()
+    {
+        $field = new Field('test', ['type' => 'toggle', 'default' => true]);
+
+        $this->assertTrue($field->toQueryableValue(null));
+        $this->assertTrue($field->toQueryableValue(true));
+        $this->assertFalse($field->toQueryableValue(false));
+    }
+
+    #[Test]
+    public function it_converts_a_null_value_to_a_queryable_value_when_there_is_no_default()
+    {
+        $this->assertFalse((new Field('test', ['type' => 'toggle']))->toQueryableValue(null));
+        $this->assertNull((new Field('test', ['type' => 'text']))->toQueryableValue(null));
+        $this->assertEquals('foo', (new Field('test', ['type' => 'text', 'default' => 'bar']))->toQueryableValue('foo'));
+    }
+
+    #[Test]
+    public function it_does_not_use_a_computed_default_when_converting_to_a_queryable_value()
+    {
+        Fields::computedDefault('computed-value', fn () => 'computed defined default');
+
+        $field = new Field('test', ['type' => 'text', 'default' => 'computed:computed-value']);
+
+        $this->assertNull($field->toQueryableValue(null));
+    }
 }

tests/Tags/Collection/EntriesTest.php

@@ -253,6 +253,20 @@ public function it_limits_entries_with_offset_using_value_objects()
         );
     }
 
+    #[Test]
+    public function it_filters_by_a_fields_default_value()
+    {
+        $blueprint = Blueprint::makeFromFields(['my_toggle' => ['type' => 'toggle', 'default' => true]])->setHandle('test');
+        Blueprint::shouldReceive('in')->with('collections/test')->andReturn(collect([$blueprint]));
+
+        $this->makeEntry('unsaved')->save();
+        $this->makeEntry('explicit-true')->set('my_toggle', true)->save();
+        $this->makeEntry('explicit-false')->set('my_toggle', false)->save();
+
+        $this->assertEqualsCanonicalizing(['unsaved', 'explicit-true'], $this->getEntryIds(['my_toggle:is' => 'true']));
+        $this->assertEquals(['explicit-false'], $this->getEntryIds(['my_toggle:is' => 'false']));
+    }
+
     #[Test]
     public function it_filters_by_future_and_past()
     {