Feat 5376 improve the select query

composer.json

@@ -22,7 +22,7 @@
         ],
         "test": [
             "Composer\\Config::disableProcessTimeout",
-            "docker compose exec tests vendor/bin/phpunit --configuration phpunit.xml"
+            "docker compose exec tests vendor/bin/phpunit --configuration phpunit.xml --stop-on-failure"
         ],
         "lint": "./vendor/bin/pint --test",
         "format": "./vendor/bin/pint",

src/Database/Adapter/MariaDB.php

@@ -1046,17 +1046,31 @@ public function find(string $collection, array $queries = [], ?int $limit = 25,
         $results = $stmt->fetchAll();
 
         foreach ($results as $key => $value) {
-            $results[$key]['$id'] = $value['_uid'];
-            $results[$key]['$internalId'] = $value['_id'];
-            $results[$key]['$createdAt'] = $value['_createdAt'];
-            $results[$key]['$updatedAt'] = $value['_updatedAt'];
-            $results[$key]['$permissions'] = json_decode($value['_permissions'] ?? '[]', true);
-
-            unset($results[$key]['_uid']);
-            unset($results[$key]['_id']);
-            unset($results[$key]['_createdAt']);
-            unset($results[$key]['_updatedAt']);
-            unset($results[$key]['_permissions']);
+
+            if (isset($value['_uid'])) {
+                $results[$key]['$id'] = $value['_uid'];
+                unset($results[$key]['_uid']);
+            }
+
+            if (isset($value['_id'])) {
+                $results[$key]['$internalId'] = $value['_id'];
+                unset($results[$key]['_id']);
+            }
+
+            if (isset($value['_createdAt'])) {
+                $results[$key]['$createdAt'] = $value['_createdAt'];
+                unset($results[$key]['_createdAt']);
+            }
+
+            if (isset($value['_updatedAt'])) {
+                $results[$key]['$updatedAt'] = $value['_updatedAt'];
+                unset($results[$key]['_updatedAt']);
+            }
+
+            if (isset($value['_permissions'])) {
+                $results[$key]['$permissions'] = json_decode($value['_permissions'] ?? '[]', true);
+                unset($results[$key]['_permissions']);
+            }
 
             $results[$key] = new Document($results[$key]);
         }
@@ -1189,10 +1203,32 @@ protected function getAttributeProjection(array $selections, string $prefix = ''
             return '*';
         }
 
+        if (in_array('$id', $selections)) {
+            $index = array_search('$id', $selections);
+            $selections[$index] = '_uid';
+        }
+
+        if (in_array('$internalId', $selections)) {
+            $index = array_search('$internalId', $selections);
+            $selections[$index] = '_id';
+        }
+
+        if (in_array('$createdAt', $selections)) {
+            $index = array_search('$createdAt', $selections);
+            $selections[$index] = '_createdAt';
+        }
+
+        if (in_array('$updatedAt', $selections)) {
+            $index = array_search('$updatedAt', $selections);
+            $selections[$index] = '_updatedAt';
+        }
+
+        if (in_array('$permissions', $selections)) {
+            $index = array_search('$permissions', $selections);
+            $selections[$index] = '_permissions';
+        }
+
         $selections[] = '_uid';
-        $selections[] = '_id';
-        $selections[] = '_createdAt';
-        $selections[] = '_updatedAt';
         $selections[] = '_permissions';
 
         if (!empty($prefix)) {

src/Database/Adapter/Postgres.php

@@ -1056,17 +1056,26 @@ public function find(string $collection, array $queries = [], ?int $limit = 25,
         $results = $stmt->fetchAll();
 
         foreach ($results as $key => $value) {
-            $results[$key]['$id'] = $value['_uid'];
-            $results[$key]['$internalId'] = $value['_id'];
-            $results[$key]['$createdAt'] = $value['_createdAt'];
-            $results[$key]['$updatedAt'] = $value['_updatedAt'];
-            $results[$key]['$permissions'] = json_decode($value['_permissions'] ?? '[]', true);
-
-            unset($results[$key]['_uid']);
-            unset($results[$key]['_id']);
-            unset($results[$key]['_createdAt']);
-            unset($results[$key]['_updatedAt']);
-            unset($results[$key]['_permissions']);
+            if(isset($value['_uid'])){
+                $results[$key]['$id'] = $value['_uid'];
+                unset($results[$key]['_uid']);
+            }
+            if(isset($value['_id'])){
+                $results[$key]['$internalId'] = $value['_id'];
+                unset($results[$key]['_id']);
+            }
+            if(isset($value['_createdAt'])){
+                $results[$key]['$createdAt'] = $value['_createdAt'];
+                unset($results[$key]['_createdAt']);
+            }
+            if(isset($value['_updatedAt'])){
+                $results[$key]['$updatedAt'] = $value['_updatedAt'];
+                unset($results[$key]['_updatedAt']);
+            }
+            if(isset($value['_permissions'])){
+                $results[$key]['$permissions'] = json_decode($value['_permissions'] ?? '[]', true);
+                unset($results[$key]['_permissions']);
+            }
 
             $results[$key] = new Document($results[$key]);
         }

src/Database/Adapter/SQL.php

@@ -127,17 +127,30 @@ public function getDocument(string $collection, string $id, array $queries = [])
             return new Document([]);
         }
 
-        $document['$id'] = $document['_uid'];
-        $document['$internalId'] = $document['_id'];
-        $document['$createdAt'] = $document['_createdAt'];
-        $document['$updatedAt'] = $document['_updatedAt'];
-        $document['$permissions'] = json_decode($document['_permissions'] ?? '[]', true);
-
-        unset($document['_id']);
-        unset($document['_uid']);
-        unset($document['_createdAt']);
-        unset($document['_updatedAt']);
-        unset($document['_permissions']);
+        if(isset($document['_uid'])){
+            $document['$id'] = $document['_uid'];
+            unset($document['_uid']);
+        }
+
+        if(isset($document['_id'])){
+            $document['$internalId'] = $document['_id'];
+            unset($document['_id']);
+        }
+
+        if(isset($document['_createdAt'])){
+            $document['$createdAt'] = $document['_createdAt'];
+            unset($document['_createdAt']);
+        }
+
+        if(isset($document['_updatedAt'])){
+            $document['$updatedAt'] = $document['_updatedAt'];
+            unset($document['_updatedAt']);
+        }
+
+        if(isset($document['_permissions'])){
+            $document['$permissions'] = json_decode($document['_permissions'] ?? '[]', true);
+            unset($document['_permissions']);
+        }
 
         return new Document($document);
     }

src/Database/Database.php

@@ -2263,6 +2263,26 @@ public function getDocument(string $collection, string $id, array $queries = [])
 
         $this->trigger(self::EVENT_DOCUMENT_READ, $document);
 
+        foreach ($queries as $query){
+            if($query->getMethod() == Query::TYPE_SELECT){
+                $queriedValues = $query->getValues();
+                $defaultKeys = ['$id', '$internalId', '$permissions', '$createdAt', '$updatedAt', '$collection'];
+
+                foreach($queriedValues as $queriedValue){
+                    if(in_array($queriedValue, $defaultKeys)){
+                        $index = array_search($queriedValue, $defaultKeys);
+                        unset($defaultKeys[$index]);
+                    }
+                }
+
+                foreach($defaultKeys as $defaultKey){
+                    if($document->isSet($defaultKey)){
+                        $document->removeAttribute($defaultKey);
+                    }
+                }
+            }   
+        }
+
         return $document;
     }
 
@@ -3978,6 +3998,21 @@ public function find(string $collection, array $queries = [], ?int $timeout = nu
 
         $this->trigger(self::EVENT_DOCUMENT_FIND, $results);
 
+        // remove default keys $id and $permissions from the results
+
+        foreach ($queries as $query) {
+            if($query->getMethod() === Query::TYPE_SELECT){
+                foreach ($results as $result) {
+                    $result->removeAttribute('$id');
+                    $result->removeAttribute('$permissions');
+                    $result->removeAttribute('$collection');
+                    $result->removeAttribute('$createdAt');
+                    $result->removeAttribute('$updatedAt');
+                    $result->removeAttribute('$internalId');
+                }
+            }
+        }
+
         return $results;
     }
 
@@ -4313,7 +4348,15 @@ public function decode(Document $collection, Document $document, array $selectio
             }
 
             if (empty($selections) || \in_array($key, $selections) || \in_array('*', $selections)) {
-                $document->setAttribute($key, ($array) ? $value : $value[0]);
+                if($key === '$createdAt' && $value[0] === NULL){
+                    continue;
+                }
+                else if($key === '$updatedAt' && $value[0] === NULL){
+                    continue;
+                }
+                else{
+                    $document->setAttribute($key, ($array) ? $value : $value[0]);
+                }
             }
         }
 
@@ -4471,6 +4514,12 @@ private function validateSelections(Document $collection, array $queries): array
             }
         }
 
+        $keys[] = '$id';
+        $keys[] = '$internalId';
+        $keys[] = '$createdAt';
+        $keys[] = '$updatedAt';
+        $keys[] = '$permissions';
+
         $invalid = \array_diff($selections, $keys);
         if (!empty($invalid) && !\in_array('*', $invalid)) {
             throw new DatabaseException('Cannot select attributes: ' . \implode(', ', $invalid));

tests/Database/Base.php

@@ -1016,7 +1016,9 @@ public function testGetDocument(Document $document): Document
      */
     public function testGetDocumentSelect(Document $document): Document
     {
-        $document = static::getDatabase()->getDocument('documents', $document->getId(), [
+        $documentId = $document->getId();
+
+        $document = static::getDatabase()->getDocument('documents', $documentId, [
             Query::select(['string', 'integer']),
         ]);
 
@@ -1029,6 +1031,22 @@ public function testGetDocumentSelect(Document $document): Document
         $this->assertArrayNotHasKey('boolean', $document->getAttributes());
         $this->assertArrayNotHasKey('colors', $document->getAttributes());
         $this->assertArrayNotHasKey('with-dash', $document->getAttributes());
+        $this->assertArrayNotHasKey('$id', $document);
+        $this->assertArrayNotHasKey('$internalId', $document);
+        $this->assertArrayNotHasKey('$collection', $document);
+        $this->assertArrayNotHasKey('$permissions', $document);
+        $this->assertArrayNotHasKey('$createdAt', $document);
+        $this->assertArrayNotHasKey('$updatedAt', $document);
+
+        $document = static::getDatabase()->getDocument('documents', $documentId, [
+            Query::select(['string', 'integer', '$id', '$internalId', '$permissions', '$createdAt', '$updatedAt']),
+        ]);
+
+        $this->assertArrayHasKey('$id', $document);
+        $this->assertArrayHasKey('$internalId', $document);
+        $this->assertArrayHasKey('$permissions', $document);
+        $this->assertArrayHasKey('$createdAt', $document);
+        $this->assertArrayHasKey('$updatedAt', $document);
 
         return $document;
     }
@@ -2539,18 +2557,19 @@ public function testFindSelect(): void
         $documents = static::getDatabase()->find('movies', [
             Query::select(['name', 'year'])
         ]);
+
         foreach ($documents as $document) {
-            $this->assertArrayHasKey('$id', $document);
-            $this->assertArrayHasKey('$internalId', $document);
-            $this->assertArrayHasKey('$collection', $document);
-            $this->assertArrayHasKey('$createdAt', $document);
-            $this->assertArrayHasKey('$updatedAt', $document);
-            $this->assertArrayHasKey('$permissions', $document);
             $this->assertArrayHasKey('name', $document);
             $this->assertArrayHasKey('year', $document);
-            $this->assertArrayNotHasKey('director', $document);
             $this->assertArrayNotHasKey('price', $document);
             $this->assertArrayNotHasKey('active', $document);
+            $this->assertArrayNotHasKey('director', $document);
+            $this->assertArrayNotHasKey('$id', $document);
+            $this->assertArrayNotHasKey('$internalId', $document);
+            $this->assertArrayNotHasKey('$collection', $document);
+            $this->assertArrayNotHasKey('$createdAt', $document);
+            $this->assertArrayNotHasKey('$updatedAt', $document);
+            $this->assertArrayNotHasKey('$permissions', $document);
         }
     }
 
@@ -4156,7 +4175,7 @@ public function testOneToOneOneWayRelationship(): void
         $this->assertArrayNotHasKey('area', $person->getAttribute('library'));
 
         $person = static::getDatabase()->getDocument('person', 'person1', [
-            Query::select(['*', 'library.name'])
+            Query::select(['*', 'library.name', '$id'])
         ]);
 
         $this->assertEquals('Library 1', $person->getAttribute('library')->getAttribute('name'));