Revert to only wait for the previous search indexes to be dropped

Author: GromNaN

docs/includes/fundamentals/as-avs/AtlasSearchTest.php

@@ -52,9 +52,9 @@ protected function setUp(): void
         ]));
 
         // Waits for the search index created in the previous test to be deleted
-        do {
-            usleep(1_000);
-        } while ($moviesCollection->listSearchIndexes()->count());
+        while ($moviesCollection->listSearchIndexes()->count()) {
+            usleep(1000);
+        }
 
         try {
             $moviesCollection->createSearchIndex([

tests/AtlasSearchTest.php

@@ -29,12 +29,12 @@ class AtlasSearchTest extends TestCase
 
     public function setUp(): void
     {
-        // Use a unique prefix per test to avoid collisions when the search index is
-        // deleted asynchronously while we try to create it in setup of the next test
-        $_SERVER['DB_PREFIX'] = 'AtlasSearchTest_' . $this->name() . '_';
-
         parent::setUp();
 
+        $collection = $this->getConnection('mongodb')->getCollection('books');
+        assert($collection instanceof MongoDBCollection);
+        $collection->drop();
+
         Book::insert($this->addVector([
             ['title' => 'Introduction to Algorithms'],
             ['title' => 'Clean Code: A Handbook of Agile Software Craftsmanship'],
@@ -58,10 +58,12 @@ public function setUp(): void
             ['title' => 'Pattern Recognition and Machine Learning'],
         ]));
 
-        $collection = $this->getConnection('mongodb')->getCollection($this->getBookCollectionName());
-        assert($collection instanceof MongoDBCollection);
-
         try {
+            // Waits for the search index created in the previous test to be deleted
+            while ($collection->listSearchIndexes()->count()) {
+                usleep(1000);
+            }
+
             $collection->createSearchIndex([
                 'mappings' => [
                     'fields' => [
@@ -105,15 +107,14 @@ public function setUp(): void
 
     public function tearDown(): void
     {
-        $this->getConnection('mongodb')->getCollection($this->getBookCollectionName())->drop();
-        unset($_SERVER['DB_PREFIX']);
+        $this->getConnection('mongodb')->getCollection('books')->drop();
 
         parent::tearDown();
     }
 
     public function testGetIndexes()
     {
-        $indexes = Schema::getIndexes($this->getBookCollectionName());
+        $indexes = Schema::getIndexes('books');
 
         self::assertIsArray($indexes);
         self::assertCount(4, $indexes);
@@ -174,7 +175,7 @@ public function testEloquentBuilderSearch()
 
     public function testDatabaseBuilderSearch()
     {
-        $results = $this->getConnection('mongodb')->table($this->getBookCollectionName())
+        $results = $this->getConnection('mongodb')->table('books')
             ->search(Search::text('title', 'systems'), sort: ['title' => 1]);
 
         self::assertInstanceOf(LaravelCollection::class, $results);
@@ -202,7 +203,7 @@ public function testEloquentBuilderAutocomplete()
 
     public function testDatabaseBuilderAutocomplete()
     {
-        $results = $this->getConnection('mongodb')->table($this->getBookCollectionName())
+        $results = $this->getConnection('mongodb')->table('books')
             ->autocomplete('title', 'system');
 
         self::assertInstanceOf(LaravelCollection::class, $results);
@@ -216,7 +217,7 @@ public function testDatabaseBuilderAutocomplete()
 
     public function testDatabaseBuilderVectorSearch()
     {
-        $results = $this->getConnection('mongodb')->table($this->getBookCollectionName())
+        $results = $this->getConnection('mongodb')->table('books')
             ->vectorSearch(
                 index: 'vector',
                 path: 'vector4',
@@ -256,15 +257,6 @@ public function testEloquentBuilderVectorSearch()
         );
     }
 
-    private function getBookCollectionName(): string
-    {
-        $name = (new Book())->getTable();
-
-        self::assertStringStartsWith('AtlasSearchTest_', $name);
-
-        return $name;
-    }
-
     /** Generate random vectors using fixed seed to make tests deterministic */
     private function addVector(array $items): array
     {

tests/Models/Book.php

@@ -23,15 +23,6 @@ class Book extends Model
     protected $table = 'books';
     protected static $unguarded = true;
 
-    public function __construct(array $attributes = [])
-    {
-        /* @TODO remove when connection prefix is supported
-         * @see https://jira.mongodb.org/browse/PHPORM-433 */
-        $this->table = ($_SERVER['DB_PREFIX'] ?? '') . $this->table;
-
-        parent::__construct($attributes);
-    }
-
     public function author(): BelongsTo
     {
         return $this->belongsTo(User::class, 'author_id');