Joins

composer.json

@@ -26,7 +26,7 @@
         "ext-curl": "*",
         "ext-openssl": "*",
         "appwrite/appwrite": "19.*",
-        "utopia-php/database": "5.*",
+      "utopia-php/database": "dev-joins8 as 5.3.1",
         "utopia-php/storage": "1.0.*",
         "utopia-php/dsn": "0.2.*",
         "halaxa/json-machine": "^1.2"

src/Migration/Destinations/Appwrite.php

@@ -512,6 +512,8 @@ protected function createEntity(Table $resource): bool
             'search' => implode(' ', [$resource->getId(), $resource->getTableName()]),
             '$createdAt' => $createdAt,
             '$updatedAt' => $updatedAt,
+            'attributes' => null,
+            'indexes' => null,
         ]));
 
         $resource->setSequence($table->getSequence());

src/Migration/Resources/Database/Database.php

@@ -39,6 +39,7 @@ public function __construct(
      *     updatedAt: string,
      *     enabled: bool,
      *     originalId: string|null,
+     *     type: string|null,
      *     database: string
      * } $array
      */

src/Migration/Sources/Appwrite.php

@@ -1100,6 +1100,11 @@ private function exportRecords(string $entityName, string $fieldName, int $batch
                 }
 
                 $selects = ['*', '$id', '$permissions', '$updatedAt', '$createdAt']; // We want relations flat!
+
+                foreach ($selects as $select) {
+                    $queries[] = $this->reader->querySelect($select);
+                }
+
                 $manyToMany = [];
 
                 if ($this->reader->getSupportForAttributes()) {
@@ -1118,22 +1123,22 @@ private function exportRecords(string $entityName, string $fieldName, int $batch
                     }
                 }
 
-                $queries[] = $this->reader->querySelect($selects);
-
                 $response = $this->reader->listRows($table, $queries);
 
                 foreach ($response as $row) {
                     // HACK: Handle many to many (only for schema-based databases)
                     if (!empty($manyToMany)) {
-                        $stack = ['$id']; // Adding $id because we can't select only relations
+                        $queries = [];
+                        $queries[] = $this->reader->querySelect('$id'); // Adding $id because we can't select only relations
+
                         foreach ($manyToMany as $relation) {
-                            $stack[] = $relation . '.$id';
+                            $queries[] = $this->reader->querySelect($relation . '.$id');
                         }
 
                         $rowItem = $this->reader->getRow(
                             $table,
                             $row['$id'],
-                            [$this->reader->querySelect($stack)]
+                            $queries
                         );
 
                         foreach ($manyToMany as $key) {

src/Migration/Sources/Appwrite/Reader.php

@@ -2,6 +2,7 @@
 
 namespace Utopia\Migration\Sources\Appwrite;
 
+use Utopia\Database\Query;
 use Utopia\Migration\Resource;
 use Utopia\Migration\Resources\Database\Database;
 use Utopia\Migration\Resources\Database\Table;
@@ -78,10 +79,10 @@ public function getRow(Table $resource, string $rowId, array $queries = []): arr
     /**
      * Return a query to select the given attributes
      *
-     * @param array $columns
+     * @param string $column
      * @return QueryType|string
      */
-    public function querySelect(array $columns): mixed;
+    public function querySelect(string $column): mixed;
 
     /**
      * Return a query to filter the given attributes

src/Migration/Sources/Appwrite/Reader/API.php

@@ -212,12 +212,12 @@ public function getRow(Table $resource, string $rowId, array $queries = []): arr
     }
 
     /**
-     * @param array $columns
+     * @param string $column
      * @return string
      */
-    public function querySelect(array $columns): string
+    public function querySelect(string $column): string
     {
-        return Query::select($columns);
+        return Query::select([$column]);
     }
 
     /**

src/Migration/Sources/Appwrite/Reader/Database.php

@@ -414,12 +414,12 @@ public function getRow(TableResource $resource, string $rowId, array $queries =
     }
 
     /**
-     * @param array $columns
+     * @param string $column
      * @return Query
      */
-    public function querySelect(array $columns): Query
+    public function querySelect(string $column): Query
     {
-        return Query::select($columns);
+        return Query::select($column);
     }
 
     /**