Merge pull request #170 from utopia-php/db-migration-api-issue

updated to TablesDB

Author: abnegate

src/Migration/Resources/Database/Table.php

@@ -53,7 +53,7 @@ public static function fromArray(array $array): self
             Database::fromArray($array['database']),
             name: $array['name'],
             id: $array['id'],
-            rowSecurity: $array['rowSecurity'] ?? $array['documentSecurity'],
+            rowSecurity: (bool) ($array['rowSecurity'] ?? $array['documentSecurity'] ?? false),
             permissions: $array['permissions'] ?? [],
             createdAt: $array['createdAt'] ?? '',
             updatedAt: $array['updatedAt'] ?? '',

src/Migration/Sources/Appwrite.php

@@ -5,11 +5,11 @@
 use Appwrite\AppwriteException;
 use Appwrite\Client;
 use Appwrite\Query;
-use Appwrite\Services\Databases;
 use Appwrite\Services\Functions;
 use Appwrite\Services\Messaging;
 use Appwrite\Services\Sites;
 use Appwrite\Services\Storage;
+use Appwrite\Services\TablesDB;
 use Appwrite\Services\Teams;
 use Appwrite\Services\Users;
 use Utopia\Database\Database as UtopiaDatabase;
@@ -127,7 +127,7 @@ public function __construct(
 
         switch ($this->source) {
             case static::SOURCE_API:
-                $this->reader = new APIReader(new Databases($this->client));
+                $this->reader = new APIReader(new TablesDB($this->client));
                 break;
 
             case static::SOURCE_DATABASE:
@@ -928,10 +928,12 @@ private function exportEntities(string $databaseName, int $batchSize): void
 
                 $response = $this->reader->listTables($database, $queries);
                 foreach ($response as $table) {
+                    $rowSecurity = $table['rowSecurity'] ?? $table['documentSecurity'] ?? false;
                     $newTable = self::getEntity($databaseName, [
                         'id' => $table['$id'],
                         'name' => $table['name'],
-                        'documentSecurity' => $table['documentSecurity'],
+                        'rowSecurity' => $rowSecurity,
+                        'documentSecurity' => $rowSecurity,
                         'permissions' => $table['$permissions'],
                         'createdAt' => $table['$createdAt'],
                         'updatedAt' => $table['$updatedAt'],
@@ -1153,10 +1155,11 @@ private function exportRecords(string $entityName, string $fieldName, int $batch
 
                     unset($row['$id']);
                     unset($row['$permissions']);
-                    unset($row['$collectionId']);
                     unset($row['$databaseId']);
                     unset($row['$sequence']);
                     unset($row['$collection']);
+                    unset($row['$tableId']);
+                    unset($row['$table']);
 
                     $row = self::getRecord($table->getDatabase()->getType(), [
                         'id' => $id,

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

@@ -4,8 +4,7 @@
 
 use Appwrite\AppwriteException;
 use Appwrite\Query;
-use Appwrite\Services\Databases;
-/* use Appwrite\Services\Tables; */
+use Appwrite\Services\TablesDB;
 use Utopia\Migration\Resource;
 use Utopia\Migration\Resources\Database\Database;
 use Utopia\Migration\Resources\Database\Table;
@@ -17,8 +16,7 @@
 class API implements Reader
 {
     public function __construct(
-        private readonly Databases $database,
-        /* private readonly Tables $table, */
+        private readonly TablesDB $database,
     ) {
     }
 
@@ -73,13 +71,12 @@ public function report(array $resources, array &$report, array $resourceIds = []
             $lastTable = null;
 
             while (true) {
-                /* $currentTables = $this->tables->list(...); */
-                $currentTables = $this->database->listCollections(
+                $currentTables = $this->database->listTables(
                     $databaseId,
                     $lastTable
                         ? [Query::cursorAfter($lastTable)]
                         : [Query::limit($pageLimit)]
-                )['collections']; /* ['tables'] */
+                )['tables'];
 
                 $tables = \array_merge($tables, $currentTables);
                 $lastTable = $tables[count($tables) - 1]['$id'] ?? null;
@@ -108,8 +105,7 @@ public function report(array $resources, array &$report, array $resourceIds = []
                     }
 
                     if (Resource::isSupported(Resource::TYPE_ROW, $resources)) {
-                        /* $rowsResponse = $this->tables->listRows(...) */
-                        $rowsResponse = $this->database->listDocuments(
+                        $rowsResponse = $this->database->listRows(
                             $databaseId,
                             $tableId,
                             [Query::limit(1)]
@@ -137,11 +133,10 @@ public function listDatabases(array $queries = []): array
      */
     public function listTables(Database $resource, array $queries = []): array
     {
-        /* $this->tables->list(...)['tables'] */
-        return $this->database->listCollections(
+        return $this->database->listTables(
             $resource->getId(),
             $queries
-        )['collections'];
+        )['tables'];
     }
 
     /**
@@ -152,12 +147,11 @@ public function listTables(Database $resource, array $queries = []): array
      */
     public function listColumns(Table $resource, array $queries = []): array
     {
-        /* $this->tables->listColumns(...)['columns'] */
-        return $this->database->listAttributes(
+        return $this->database->listColumns(
             $resource->getDatabase()->getId(),
             $resource->getId(),
             $queries
-        )['attributes'];
+        )['columns'];
     }
 
     /**
@@ -168,7 +162,6 @@ public function listColumns(Table $resource, array $queries = []): array
      */
     public function listIndexes(Table $resource, array $queries = []): array
     {
-        /* $this->tables->listIndexes(...)['indexes'] */
         return $this->database->listIndexes(
             $resource->getDatabase()->getId(),
             $resource->getId(),
@@ -185,12 +178,11 @@ public function listIndexes(Table $resource, array $queries = []): array
      */
     public function listRows(Table $resource, array $queries = []): array
     {
-        /* $this->tables->listRows(...)['rows'] */
-        return $this->database->listDocuments(
+        return $this->database->listRows(
             $resource->getDatabase()->getId(),
             $resource->getId(),
             $queries
-        )['documents'];
+        )['rows'];
     }
 
     /**
@@ -202,8 +194,7 @@ public function listRows(Table $resource, array $queries = []): array
      */
     public function getRow(Table $resource, string $rowId, array $queries = []): array
     {
-        /* $this->tables->getRow(...) */
-        return $this->database->getDocument(
+        return $this->database->getRow(
             $resource->getDatabase()->getId(),
             $resource->getId(),
             $rowId,