mirror of
https://github.com/appwrite/appwrite.git
synced 2026-11-18 20:36:03 +00:00
Merge pull request #170 from utopia-php/db-migration-api-issue
updated to TablesDB
This commit is contained in:
3 files changed
+20
-26
No files matched your search
@@ -53,7 +53,7 @@ class Table extends Resource
|
||||
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'] ?? '',
|
||||
|
||||
@@ -5,11 +5,11 @@ namespace Utopia\Migration\Sources;
|
||||
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 @@ class Appwrite extends Source
|
||||
|
||||
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 @@ class Appwrite extends Source
|
||||
|
||||
$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 @@ class Appwrite extends Source
|
||||
|
||||
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,
|
||||
|
||||
@@ -4,8 +4,7 @@ namespace Utopia\Migration\Sources\Appwrite\Reader;
|
||||
|
||||
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 @@ use Utopia\Migration\Sources\Appwrite\Reader;
|
||||
class API implements Reader
|
||||
{
|
||||
public function __construct(
|
||||
private readonly Databases $database,
|
||||
/* private readonly Tables $table, */
|
||||
private readonly TablesDB $database,
|
||||
) {
|
||||
}
|
||||
|
||||
@@ -73,13 +71,12 @@ class API implements Reader
|
||||
$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 @@ class API implements Reader
|
||||
}
|
||||
|
||||
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 @@ class API implements Reader
|
||||
*/
|
||||
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 @@ class API implements Reader
|
||||
*/
|
||||
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 @@ class API implements Reader
|
||||
*/
|
||||
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 @@ class API implements Reader
|
||||
*/
|
||||
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 @@ class API implements Reader
|
||||
*/
|
||||
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,
|
||||
|
||||
Reference in new issue
Block a user