Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BUGFIX: Avoid that doctrine:migrationgenerate drops pure dbal tables #5394

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Neos.Neos/Configuration/Settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,14 @@ Neos:
neos-site: Sites
neos-plugin: Plugins

persistence:
doctrine:
migrations:
ignoredTables:
'neos_asset_usage': true
'neos_neos_workspace_metadata': true
'neos_neos_workspace_role': true

Fusion:
rendering:
exceptionHandler: Neos\Fusion\Core\ExceptionHandlers\ThrowingHandler
Expand Down
12 changes: 11 additions & 1 deletion Neos.Neos/Tests/Behavior/Features/Bootstrap/AssetUsageTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,16 @@ trait AssetUsageTrait
*/
abstract private function getObject(string $className): object;

/**
* @BeforeScenario
*/
final public function pruneAssetUsage(): void
{
foreach (static::$alreadySetUpContentRepositories as $contentRepositoryId) {
$this->getObject(\Neos\Neos\AssetUsage\Domain\AssetUsageRepository::class)->removeAll($contentRepositoryId);
}
}

/**
* @Then I expect the AssetUsageService to have the following AssetUsages:
*/
Expand Down Expand Up @@ -75,4 +85,4 @@ public function iRunTheAssetUsageIndexingProcessor(string $rootNodeTypeName)
NodeTypeName::fromString($rootNodeTypeName),
);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,17 @@ trait WorkspaceServiceTrait
*/
abstract private function getObject(string $className): object;

/**
* @BeforeScenario
*/
final public function pruneWorkspaceService(): void
{
foreach (static::$alreadySetUpContentRepositories as $contentRepositoryId) {
$this->getObject(\Neos\Neos\Domain\Repository\WorkspaceMetadataAndRoleRepository::class)->pruneWorkspaceMetadata($contentRepositoryId);
$this->getObject(\Neos\Neos\Domain\Repository\WorkspaceMetadataAndRoleRepository::class)->pruneRoleAssignments($contentRepositoryId);
}
}

/**
* @When the root workspace :workspaceName is created
* @When the root workspace :workspaceName with title :title and description :description is created
Expand Down
Loading