Merge pull request #5394 from mhsdesign/bugfix/exclude-non-doctrine-m…

…anaged-tables-from-migration-generate BUGFIX: Avoid that `doctrine:migrationgenerate` drops pure dbal tables
neos · Dec 16, 2024 · 58db026 · 58db026
2 parents f0c6111 + 447c4dc
commit 58db026
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/Neos.Neos/Configuration/Settings.yaml b/Neos.Neos/Configuration/Settings.yaml
@@ -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

diff --git a/Neos.Neos/Tests/Behavior/Features/Bootstrap/AssetUsageTrait.php b/Neos.Neos/Tests/Behavior/Features/Bootstrap/AssetUsageTrait.php
@@ -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:
      */

diff --git a/Neos.Neos/Tests/Behavior/Features/Bootstrap/WorkspaceServiceTrait.php b/Neos.Neos/Tests/Behavior/Features/Bootstrap/WorkspaceServiceTrait.php
@@ -49,6 +49,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