mirror of
https://github.com/appwrite/appwrite.git
synced 2026-11-18 20:36:03 +00:00
Tighten dropAttributeForRecreate: required $existingAttr, trimmed comments
$existingAttr is always non-empty at the only call site (UpdateInPlace fallthrough requires $exists=true). Drops the unreachable nullable fallback path and the defensive isEmpty() check. Comments collapsed to one line each — the WHY is small enough to fit.
This commit is contained in:
1 parent
aa1e7c7063
commit
4c3965bc89
1 file changed
+6
-19
@@ -838,13 +838,8 @@ class Appwrite extends Destination
|
||||
|
||||
if ($action === SchemaAction::UpdateInPlace) {
|
||||
$this->dropAttributeForRecreate($database, $table, $resource, $dbForDatabases, $existingAttr);
|
||||
// Re-fetch $table: the in-memory copy still holds the dropped
|
||||
// attribute, so checkAttribute below would over-count and trip
|
||||
// the adapter's LimitException at the column ceiling.
|
||||
$table = $this->dbForProject->getDocument(
|
||||
$this->databaseCollectionId($database),
|
||||
$table->getId(),
|
||||
);
|
||||
// Reload $table — in-memory copy still holds the dropped attribute, so checkAttribute would over-count.
|
||||
$table = $this->dbForProject->getDocument($this->databaseCollectionId($database), $table->getId());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1330,16 +1325,13 @@ class Appwrite extends Destination
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Drop attribute (meta doc + physical column). Relationships route through
|
||||
* deleteRelationship since deleteAttribute throws for VAR_RELATIONSHIP.
|
||||
*/
|
||||
/** Relationships route through deleteRelationship since deleteAttribute throws for VAR_RELATIONSHIP. */
|
||||
private function dropAttributeForRecreate(
|
||||
UtopiaDocument $database,
|
||||
UtopiaDocument $table,
|
||||
Column|Attribute $resource,
|
||||
UtopiaDatabase $dbForDatabases,
|
||||
?UtopiaDocument $existingAttr = null,
|
||||
UtopiaDocument $existingAttr,
|
||||
): void {
|
||||
$collectionId = $this->tableCollectionId($database, $table);
|
||||
$attributeMetaId = $this->attributeIndexMetaId($database, $table, $resource->getKey());
|
||||
@@ -1353,14 +1345,9 @@ class Appwrite extends Destination
|
||||
|
||||
$this->dbForProject->deleteDocument(self::META_ATTRIBUTES, $attributeMetaId);
|
||||
|
||||
// deleteRelationship only touches utopia's _metadata; clear the Appwrite-level partner meta doc too.
|
||||
// Use dest's options ($existingAttr): we drop precisely when relatedCollection/twoWayKey differ,
|
||||
// so source's options point to the NEW partner; the OLD partner meta lives where dest currently has it.
|
||||
// Use dest's options for partner lookup — drop fires when relatedCollection/twoWayKey differ, so source points to the NEW partner.
|
||||
if ($isRelationship) {
|
||||
$options = $existingAttr !== null && !$existingAttr->isEmpty()
|
||||
? (array) $existingAttr->getAttribute('options', [])
|
||||
: $resource->getOptions();
|
||||
$partner = $this->resolveTwoWayPartner($database, $options);
|
||||
$partner = $this->resolveTwoWayPartner($database, (array) $existingAttr->getAttribute('options', []));
|
||||
if ($partner !== null) {
|
||||
$this->bestEffort(fn () => $this->dbForProject->deleteDocument(self::META_ATTRIBUTES, $partner['partnerMetaId']));
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user