Merge pull request #324 from utopia-php/empty-search

Empty fulltext search
utopia-php · Sep 28, 2023 · 58d33c8 · 58d33c8
2 parents f2626ac + f01fcb3
commit 58d33c8
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 23 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Database/Adapter/SQL.php b/src/Database/Adapter/SQL.php
@@ -725,6 +725,10 @@ protected function getFulltextValue(string $value): string
         $value = preg_replace('/\s+/', ' ', $value); // Remove multiple whitespaces
         $value = trim($value);
 
+        if (empty($value)) {
+            return '';
+        }
+
         if ($exact) {
             $value = '"' . $value . '"';
         } else {

diff --git a/tests/Database/Base.php b/tests/Database/Base.php
@@ -1290,10 +1290,7 @@ public function testFulltextIndexWithInteger(): void
         static::getDatabase()->createIndex('documents', 'fulltext_integer', Database::INDEX_FULLTEXT, ['string','integer']);
     }
 
-    /**
-     * @depends testCreateDocument
-     */
-    public function testListDocumentSearch(Document $document): void
+    public function testListDocumentSearch(): void
     {
         $fulltextSupport = $this->getDatabase()->getAdapter()->getSupportForFulltextIndex();
         if (!$fulltextSupport) {
@@ -1328,6 +1325,30 @@ public function testListDocumentSearch(Document $document): void
         $this->assertEquals(1, count($documents));
     }
 
+    public function testEmptySearch(): void
+    {
+        $fulltextSupport = $this->getDatabase()->getAdapter()->getSupportForFulltextIndex();
+        if (!$fulltextSupport) {
+            $this->expectNotToPerformAssertions();
+            return;
+        }
+
+        $documents = static::getDatabase()->find('documents', [
+            Query::search('string', ''),
+        ]);
+        $this->assertEquals(0, count($documents));
+
+        $documents = static::getDatabase()->find('documents', [
+            Query::search('string', '*'),
+        ]);
+        $this->assertEquals(0, count($documents));
+
+        $documents = static::getDatabase()->find('documents', [
+            Query::search('string', '<>'),
+        ]);
+        $this->assertEquals(0, count($documents));
+    }
+
     /**
      * @depends testGetDocument
      */