diff --git a/src/Migration/Destinations/Appwrite.php b/src/Migration/Destinations/Appwrite.php index 1d7522c..a58b814 100644 --- a/src/Migration/Destinations/Appwrite.php +++ b/src/Migration/Destinations/Appwrite.php @@ -72,11 +72,6 @@ class Appwrite extends Destination */ protected $getDatabasesDB; - /** - * @var callable(string $databaseType):string - */ - protected $getDatabaseDSN; - /** * @var array */ @@ -88,7 +83,6 @@ class Appwrite extends Destination * @param string $key * @param UtopiaDatabase $dbForProject * @param callable(UtopiaDocument $database):UtopiaDatabase $getDatabasesDB - * @param callable(string $databaseType):string $getDatabaseDSN * @param array> $collectionStructure */ public function __construct( @@ -97,7 +91,6 @@ public function __construct( string $key, protected UtopiaDatabase $dbForProject, callable $getDatabasesDB, - callable $getDatabaseDSN, protected array $collectionStructure ) { $this->project = $project; @@ -116,7 +109,6 @@ public function __construct( $this->users = new Users($this->client); $this->getDatabasesDB = $getDatabasesDB; - $this->getDatabaseDSN = $getDatabaseDSN; } public static function getName(): string @@ -385,7 +377,7 @@ protected function createDatabase(Database $resource): bool 'originalId' => empty($resource->getOriginalId()) ? null : $resource->getOriginalId(), 'type' => empty($resource->getType()) ? 'legacy' : $resource->getType(), // source and destination can be in different location - 'database' => ($this->getDatabaseDSN)($resource->getType()) + 'database' => $resource->getDatabase() ])); $resource->setSequence($database->getSequence()); diff --git a/src/Migration/Resources/Database/Database.php b/src/Migration/Resources/Database/Database.php index 9c90498..05afab2 100644 --- a/src/Migration/Resources/Database/Database.php +++ b/src/Migration/Resources/Database/Database.php @@ -68,6 +68,7 @@ public function jsonSerialize(): array 'updatedAt' => $this->updatedAt, 'enabled' => $this->enabled, 'type' => $this->type, + 'database' => $this->database ]; } diff --git a/src/Migration/Resources/Database/DocumentsDB.php b/src/Migration/Resources/Database/DocumentsDB.php index 5409138..8d6b5ac 100644 --- a/src/Migration/Resources/Database/DocumentsDB.php +++ b/src/Migration/Resources/Database/DocumentsDB.php @@ -31,8 +31,8 @@ public static function fromArray(array $array): self updatedAt: $array['updatedAt'] ?? '', enabled: $array['enabled'] ?? true, originalId: $array['originalId'] ?? '', - type: $array['type'] ?? 'legacy', - database: $array['database'] ?? 'legacy' + type: $array['type'] ?? Resource::TYPE_DATABASE_DOCUMENTSDB, + database: $array['database'] ); } } diff --git a/src/Migration/Resources/Database/VectorDB.php b/src/Migration/Resources/Database/VectorDB.php index 6fc7166..f7eaf78 100644 --- a/src/Migration/Resources/Database/VectorDB.php +++ b/src/Migration/Resources/Database/VectorDB.php @@ -32,8 +32,8 @@ public static function fromArray(array $array): self updatedAt: $array['updatedAt'] ?? '', enabled: $array['enabled'] ?? true, originalId: $array['originalId'] ?? '', - type: $array['type'] ?? 'legacy', - database: $array['database'] ?? 'legacy' + type: $array['type'] ?? Resource::TYPE_DATABASE_VECTORDB, + database: $array['database'] ); } }