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.

Sign up for GitHub

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

TASK: Check against LiveWorkspaceName Instead Of Comparing CS Ids #5149

Merged
merged 3 commits into from
Sep 25, 2024
Merged

TASK: Check against LiveWorkspaceName Instead Of Comparing CS Ids #5149

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83caa70
TASK: Check against LiveWorkspaceName Instead Of Comparing CS Ids
mhsdesign Jun 19, 2024
417c4ba
Merge remote-tracking branch 'origin/9.0' into task/refactorIsLiveCon…
mhsdesign Sep 24, 2024
2ea5e98
TASK: Add migration to drop old `_livecontentstreams` table
mhsdesign Sep 24, 2024
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: 6 additions & 2 deletions Neos.Neos/Classes/FrontendRouting/Projection/DocumentUriPathProjection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

use Doctrine\DBAL\Connection;
use Doctrine\DBAL\Exception as DBALException;
use Doctrine\DBAL\Schema\AbstractSchemaManager;
use Doctrine\DBAL\Types\Types;
use Neos\ContentRepository\Core\DimensionSpace\OriginDimensionSpacePoint;
use Neos\ContentRepository\Core\EventStore\EventInterface;
Expand Down Expand Up @@ -108,7 +107,12 @@ private function determineRequiredSqlStatements(): array
{
$schemaManager = $this->dbal->createSchemaManager();
$schema = (new DocumentUriPathSchemaBuilder($this->tableNamePrefix))->buildSchema($schemaManager);
return DbalSchemaDiff::determineRequiredSqlStatements($this->dbal, $schema);
$statements = DbalSchemaDiff::determineRequiredSqlStatements($this->dbal, $schema);
// MIGRATIONS
if ($this->dbal->getSchemaManager()->tablesExist([$this->tableNamePrefix . '_livecontentstreams'])) {
$statements[] = sprintf('DROP table %s_livecontentstreams;', $this->tableNamePrefix);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not a huge fan.... I would just leave this dangling, we can consider something for these cases after release...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

im not a huge fan either from these hardcoded migrations, but Sebastian started introducing them and we can delete them at some point if we want. So thats why ill merge it.

}
return $statements;
}


Expand Down
7 changes: 6 additions & 1 deletion Neos.Neos/Classes/PendingChangesProjection/ChangeProjection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,12 @@ private function determineRequiredSqlStatements(): array
]);

$schema = DbalSchemaFactory::createSchemaWithTables($schemaManager, [$changeTable]);
return DbalSchemaDiff::determineRequiredSqlStatements($connection, $schema);
$statements = DbalSchemaDiff::determineRequiredSqlStatements($connection, $schema);
// MIGRATIONS
if ($this->dbal->getSchemaManager()->tablesExist([$this->tableNamePrefix . '_livecontentstreams'])) {
$statements[] = sprintf('DROP table %s_livecontentstreams;', $this->tableNamePrefix);
}
return $statements;
}

public function reset(): void
Expand Down
Loading