Merge remote-tracking branch 'origin/1.6.x' into feat-batch-usage-dump

This commit is contained in:
Jake Barnby 2025-01-23 17:42:00 +13:00
commit b56fda0029
No known key found for this signature in database
GPG key ID: C437A8CC85B96E9C

View file

@ -535,6 +535,8 @@ class Databases extends Action
$databaseId = $database->getId();
$databaseInternalId = $database->getInternalId();
$dbForProject->deleteCollection('database_' . $databaseInternalId . '_collection_' . $collection->getInternalId());
/**
* Related collections relating to current collection
*/
@ -553,8 +555,6 @@ class Databases extends Action
}
);
$dbForProject->deleteCollection('database_' . $databaseInternalId . '_collection_' . $collection->getInternalId());
$this->deleteByGroup('attributes', [
Query::equal('databaseInternalId', [$databaseInternalId]),
Query::equal('collectionInternalId', [$collectionInternalId])