Merge branch 'feat-mongo-2' of github.com:utopia-php/database into mongo-transactions

# Conflicts:
#	src/Database/Adapter/Mongo.php

Author: shimonewman

src/Database/Adapter.php

@@ -376,7 +376,6 @@ public function withTransaction(callable $callback): mixed
                 $this->startTransaction();
                 $result = $callback();
                 $this->commitTransaction();
-
                 return $result;
             } catch (\Throwable $action) {
                 try {

src/Database/Adapter/Mongo.php

@@ -340,6 +340,7 @@ public function createCollection(string $name, array $attributes = [], array $in
         // Returns an array/object with the result document
         try {
             $this->getClient()->createCollection($id);
+
         } catch (MongoException $e) {
             throw new Duplicate($e->getMessage(), $e->getCode(), $e);
         }
@@ -534,6 +535,7 @@ public function createAttributes(string $collection, array $attributes): bool
     public function deleteAttribute(string $collection, string $id): bool
     {
         $collection = $this->getNamespace() . '_' . $this->filter($collection);
+
         $this->getClient()->update(
             $collection,
             [],
@@ -734,6 +736,7 @@ public function createIndex(string $collection, string $id, string $type, array
         $id = $this->filter($id);
 
         $indexes = [];
+        $options = [];
 
         // pass in custom index name
         $indexes['name'] = $id;
@@ -774,7 +777,7 @@ public function createIndex(string $collection, string $id, string $type, array
             ];
         }
 
-        return $this->client->createIndexes($name, [$indexes]);
+        return $this->client->createIndexes($name, [$indexes], $options);
     }
 
     /**
@@ -865,7 +868,7 @@ public function getDocument(string $collection, string $id, array $queries = [],
         }
 
         $result = $this->client->find($name, $filters, $options)->cursor->firstBatch;
-   
+
         if (empty($result)) {
             return new Document([]);
         }
@@ -927,7 +930,6 @@ public function createDocuments(string $collection, array $documents): array
     {
         $name = $this->getNamespace() . '_' . $this->filter($collection);
 
-        // Initialize transaction context before validation to ensure transaction is active
         $options = $this->addTransactionContext([]);
 
         $records = [];
@@ -1081,7 +1083,7 @@ public function createOrUpdateDocuments(string $collection, string $attribute, a
         if (empty($changes)) {
             return $changes;
         }
-       
+
         try {
             $name = $this->getNamespace() . '_' . $this->filter($collection);
             $attribute = $this->filter($attribute);
@@ -1098,7 +1100,7 @@ public function createOrUpdateDocuments(string $collection, string $attribute, a
                 $attributes['_createdAt'] = $document->getCreatedAt();
                 $attributes['_updatedAt'] = $document->getUpdatedAt();
                 $attributes['_permissions'] = $document->getPermissions();
-          
+
                 if (!empty($document->getSequence())) {
                     $attributes['_id'] = new ObjectId($document->getSequence());
                 } else {
@@ -1113,7 +1115,7 @@ public function createOrUpdateDocuments(string $collection, string $attribute, a
                 $record = $this->replaceChars('$', '_', $attributes);
                 $record = $this->timeToMongo($record);
                 $record = $this->removeNullKeys($record);
-               
+
 
                 // Build filter for upsert
                 $filter = ['_uid' => $document->getId()];
@@ -1149,7 +1151,7 @@ public function createOrUpdateDocuments(string $collection, string $attribute, a
             // Get sequences for documents that were created
             if (!empty($documentIds)) {
                 $sequences = $this->getSequences($collection, $documentIds, $documentTenants);
-                
+
                 foreach ($changes as $change) {
                     if (isset($sequences[$change->getNew()->getId()])) {
                         $change->getNew()->setAttribute('$sequence', $sequences[$change->getNew()->getId()]);
@@ -1160,7 +1162,7 @@ public function createOrUpdateDocuments(string $collection, string $attribute, a
         } catch (MongoException $e) {
             throw $this->processException($e);
         }
-      
+
         return \array_map(fn ($change) => $change->getNew(), $changes);
     }
 
@@ -1189,7 +1191,7 @@ protected function getSequences(string $collection, array $documentIds, array $d
 
             try {
                 $results = $this->client->find($name, $filters, ['projection' => ['_uid' => 1, '_id' => 1]]);
-                
+
                 foreach ($results->cursor->firstBatch as $result) {
                     $sequences[$result->_uid] = (string)$result->_id;
                 }

tests/e2e/Adapter/Scopes/CollectionTests.php

@@ -649,15 +649,12 @@ public function testCreateCollectionWithSchemaIndexes(): void
             ]),
         ];
 
-        /**
-         *  Update array length check to 255
-         */
         $indexes = [
             new Document([
                 '$id' => ID::custom('idx_cards'),
                 'type' => Database::INDEX_KEY,
                 'attributes' => ['cards'],
-                'lengths' => [500],
+                'lengths' => [500], // Will be changed to Database::ARRAY_INDEX_LENGTH (255)
                 'orders' => [Database::ORDER_DESC],
             ]),
             new Document([
@@ -686,10 +683,6 @@ public function testCreateCollectionWithSchemaIndexes(): void
         );
 
         $this->assertEquals($collection->getAttribute('indexes')[0]['attributes'][0], 'cards');
-        /**
-         * If we set getMaxIndexLength to 1024 then this tests pass but other tests that depend on index length fail
-         */
-
         $this->assertEquals($collection->getAttribute('indexes')[0]['lengths'][0], Database::ARRAY_INDEX_LENGTH);
         $this->assertEquals($collection->getAttribute('indexes')[0]['orders'][0], null);
 

tests/e2e/Adapter/Scopes/DocumentTests.php

@@ -431,18 +431,16 @@ public function testUpsertDocuments(): void
         ];
 
         $results = [];
-        
         $count = $database->createOrUpdateDocuments(
             __FUNCTION__,
             $documents,
             onNext: function ($doc) use (&$results) {
                 $results[] = $doc;
             }
         );
-        
 
         $this->assertEquals(2, $count);
-       
+
         $createdAt = [];
         foreach ($results as $index => $document) {
             $createdAt[$index] = $document->getCreatedAt();
@@ -455,8 +453,8 @@ public function testUpsertDocuments(): void
             $this->assertEquals(Database::BIG_INT_MAX, $document->getAttribute('bigint'));
         }
 
-    
         $documents = $database->find(__FUNCTION__);
+
         $this->assertEquals(2, count($documents));
 
         foreach ($documents as $document) {
@@ -565,15 +563,15 @@ public function testUpsertDocumentsInc(): void
 
         $documents[0]->setAttribute('integer', -1);
         $documents[1]->setAttribute('integer', -1);
-        
+
         $database->createOrUpdateDocumentsWithIncrease(
             collection: __FUNCTION__,
             attribute: 'integer',
             documents: $documents
         );
 
         $documents = $database->find(__FUNCTION__);
-        
+
         foreach ($documents as $document) {
             $this->assertEquals(5, $document->getAttribute('integer'));
         }
@@ -1408,15 +1406,13 @@ public function testFindBasicChecks(): void
         $this->assertEquals($firstDocumentId, $documents[0]->getId());
 
         /**
-             * Check internal numeric ID sorting
-             */
+         * Check internal numeric ID sorting
+         */
         $documents = $database->find('movies', [
             Query::limit(25),
             Query::offset(0),
             Query::orderDesc(''),
         ]);
-
-
         $this->assertEquals($movieDocuments[\count($movieDocuments) - 1]->getId(), $documents[0]->getId());
         $documents = $database->find('movies', [
             Query::limit(25),
@@ -1982,8 +1978,6 @@ public function testFindOrderByAfterNaturalOrder(): void
             Query::orderDesc(''),
             Query::cursorAfter($movies[1])
         ]);
-        //var_dump($movieDocuments);
-
         $this->assertEquals(2, count($documents));
         $this->assertEquals($movies[2]['name'], $documents[0]['name']);
         $this->assertEquals($movies[3]['name'], $documents[1]['name']);
@@ -2013,7 +2007,6 @@ public function testFindOrderByAfterNaturalOrder(): void
             Query::orderDesc(''),
             Query::cursorAfter($movies[5])
         ]);
-
         $this->assertEmpty(count($documents));
     }
     public function testFindOrderByBeforeNaturalOrder(): void
@@ -4277,7 +4270,7 @@ public function testEmptyTenant(): void
         $document = $database->getDocument('documents', $document->getId());
         $this->assertArrayHasKey('$id', $document);
         $this->assertArrayNotHasKey('$tenant', $document);
-  
+
         $document = $database->updateDocument('documents', $document->getId(), $document);
         $this->assertArrayHasKey('$id', $document);
         $this->assertArrayNotHasKey('$tenant', $document);

tests/e2e/Adapter/Scopes/GeneralTests.php

@@ -120,9 +120,6 @@ public function testPreserveDatesUpdate(): void
             'attr1' => 'value3',
         ]));
 
-
-
-
         $newDate = '2000-01-01T10:00:00.000+00:00';
 
         $doc1->setAttribute('$updatedAt', $newDate);
@@ -540,7 +537,6 @@ public function testSharedTablesTenantPerDocument(): void
 
     public function testCacheFallback(): void
     {
- 
         /** @var Database $database */
         $database = static::getDatabase();