diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/ContentGraphReadModelAdapter.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/ContentGraphReadModelAdapter.php index a95df6236c9..7e5e2051a5f 100644 --- a/Neos.ContentGraph.DoctrineDbalAdapter/src/ContentGraphReadModelAdapter.php +++ b/Neos.ContentGraph.DoctrineDbalAdapter/src/ContentGraphReadModelAdapter.php @@ -159,7 +159,7 @@ private function getBasicWorkspaceQuery(): QueryBuilder $queryBuilder = $this->dbal->createQueryBuilder(); return $queryBuilder - ->select('ws.name, ws.baseWorkspaceName, ws.currentContentStreamId, cs.sourceContentStreamVersion = scs.version as upToDateWithBase, cs.dirty as workspaceHasChanges') + ->select('ws.name, ws.baseWorkspaceName, ws.currentContentStreamId, cs.hasChanges, cs.sourceContentStreamVersion = scs.version as upToDateWithBase') ->from($this->tableNames->workspace(), 'ws') ->join('ws', $this->tableNames->contentStream(), 'cs', 'cs.id = ws.currentcontentstreamid') ->leftJoin('cs', $this->tableNames->contentStream(), 'scs', 'scs.id = cs.sourceContentStreamId'); @@ -190,7 +190,7 @@ private static function workspaceFromDatabaseRow(array $row): Workspace $status, $baseWorkspaceName === null ? false - : (bool)$row['workspaceHasChanges'], + : (bool)$row['hasChanges'], ); } diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphSchemaBuilder.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphSchemaBuilder.php index 2683b06b86c..d19bb944f78 100644 --- a/Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphSchemaBuilder.php +++ b/Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphSchemaBuilder.php @@ -130,7 +130,7 @@ private function createContentStreamTable(): Table DbalSchemaFactory::columnForContentStreamId('sourceContentStreamId')->setNotnull(false), (new Column('sourceContentStreamVersion', Type::getType(Types::INTEGER)))->setNotnull(false), (new Column('closed', Type::getType(Types::BOOLEAN)))->setNotnull(true), - (new Column('dirty', Type::getType(Types::BOOLEAN)))->setNotnull(true), + (new Column('hasChanges', Type::getType(Types::BOOLEAN)))->setNotnull(true), ]); return $contentStreamTable->setPrimaryKey(['id']); diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/ContentStream.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/ContentStream.php index cbddc75ce2d..08e2e151824 100644 --- a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/ContentStream.php +++ b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/ContentStream.php @@ -22,7 +22,7 @@ private function createContentStream(ContentStreamId $contentStreamId, ?ContentS 'sourceContentStreamId' => $sourceContentStreamId?->value, 'sourceContentStreamVersion' => $sourceVersion?->value, 'closed' => 0, - 'dirty' => 0 + 'hasChanges' => 0 ]); } @@ -57,7 +57,7 @@ private function updateContentStreamVersion(ContentStreamId $contentStreamId, Ve 'version' => $version->value, ]; if ($markAsDirty) { - $updatePayload['dirty'] = 1; + $updatePayload['hasChanges'] = 1; } $this->dbal->update($this->tableNames->contentStream(), $updatePayload, [ 'id' => $contentStreamId->value,