Skip to content

fix(database): use SchemaRegistry in DiffCommand and MigrateCommand for extender merge #67

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

Open
michalbiarda wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix(database): use SchemaRegistry in DiffCommand and MigrateCommand for extender merge #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 5 additions & 12 deletions packages/database/src/Command/DiffCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@
use Marko\Database\Diff\SchemaDiff;
use Marko\Database\Diff\TableDiff;
use Marko\Database\Entity\EntityDiscovery;
use Marko\Database\Entity\EntityMetadataFactory;
use Marko\Database\Entity\SchemaBuilder;
use Marko\Database\Exceptions\EntityException;
use Marko\Database\Introspection\IntrospectorInterface;
use Marko\Database\Schema\SchemaRegistry;
use Marko\Database\Schema\Table;

/** @noinspection PhpUnused */
Expand All @@ -26,8 +25,7 @@
public function __construct(
private EntityDiscovery $discovery,
private IntrospectorInterface $introspector,
private EntityMetadataFactory $metadataFactory,
private SchemaBuilder $schemaBuilder,
private SchemaRegistry $schemaRegistry,
private DiffCalculator $diffCalculator,
private ProjectPaths $paths,
) {}
Expand Down Expand Up @@ -77,15 +75,10 @@ public function execute(
private function buildEntitySchema(
array $entityClasses,
): array {
$schema = [];

foreach ($entityClasses as $entityClass) {
$metadata = $this->metadataFactory->parse($entityClass);
$table = $this->schemaBuilder->build($metadata);
$schema[$table->name] = $table;
}
$this->schemaRegistry->clear();
$this->schemaRegistry->registerEntities($entityClasses);

return $schema;
return $this->schemaRegistry->getTables();
}

/**
Expand Down
17 changes: 5 additions & 12 deletions packages/database/src/Command/MigrateCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,13 @@
use Marko\Database\Diff\SchemaDiff;
use Marko\Database\Diff\SqlGeneratorInterface;
use Marko\Database\Entity\EntityDiscovery;
use Marko\Database\Entity\EntityMetadataFactory;
use Marko\Database\Entity\SchemaBuilder;
use Marko\Database\Exceptions\EntityException;
use Marko\Database\Exceptions\MigrationException;
use Marko\Database\Introspection\IntrospectorInterface;
use Marko\Database\Migration\DataMigrator;
use Marko\Database\Migration\MigrationGenerator;
use Marko\Database\Migration\Migrator;
use Marko\Database\Schema\SchemaRegistry;
use Marko\Database\Schema\Table;

/** @noinspection PhpUnused */
Expand All @@ -33,8 +32,7 @@ public function __construct(
private MigrationGenerator $migrationGenerator,
private EntityDiscovery $entityDiscovery,
private IntrospectorInterface $introspector,
private EntityMetadataFactory $metadataFactory,
private SchemaBuilder $schemaBuilder,
private SchemaRegistry $schemaRegistry,
private DiffCalculator $diffCalculator,
private SqlGeneratorInterface $sqlGenerator,
private ProjectPaths $paths,
Expand Down Expand Up @@ -251,15 +249,10 @@ private function calculateDiff(): SchemaDiff
private function buildEntitySchema(
array $entityClasses,
): array {
$schema = [];

foreach ($entityClasses as $entityClass) {
$metadata = $this->metadataFactory->parse($entityClass);
$table = $this->schemaBuilder->build($metadata);
$schema[$table->name] = $table;
}
$this->schemaRegistry->clear();
$this->schemaRegistry->registerEntities($entityClasses);

return $schema;
return $this->schemaRegistry->getTables();
}

/**
Expand Down
4 changes: 2 additions & 2 deletions packages/database/tests/Command/Helpers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
use Marko\Database\Entity\EntityDiscovery;
use Marko\Database\Entity\EntityMetadataFactory;
use Marko\Database\Entity\SchemaBuilder;
use Marko\Database\Schema\SchemaRegistry;
use Marko\Database\Introspection\IntrospectorInterface;
use Marko\Database\Schema\Table;

Expand Down Expand Up @@ -229,8 +230,7 @@ public static function createDiffCommand(
return new DiffCommand(
discovery: self::createStubEntityDiscovery(),
introspector: self::createStubIntrospector($tables),
metadataFactory: new EntityMetadataFactory(),
schemaBuilder: new SchemaBuilder(),
schemaRegistry: new SchemaRegistry(new EntityMetadataFactory(), new SchemaBuilder()),
diffCalculator: $diffCalculator ?? new DiffCalculator(),
paths: new ProjectPaths('/test'),
);
Expand Down
7 changes: 3 additions & 4 deletions packages/database/tests/Command/MigrateCommandTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
use Marko\Database\Diff\SqlGeneratorInterface;
use Marko\Database\Entity\EntityMetadataFactory;
use Marko\Database\Entity\SchemaBuilder;
use Marko\Database\Schema\SchemaRegistry;
use Marko\Database\Exceptions\MigrationException;
use Marko\Database\Migration\DataMigrator;
use Marko\Database\Migration\MigrationGenerator;
Expand Down Expand Up @@ -304,8 +305,7 @@ function createMigrateCommand(
migrationGenerator: $generator ?? createMigrationGeneratorStub(),
entityDiscovery: Helpers::createStubEntityDiscovery(),
introspector: Helpers::createStubIntrospector(),
metadataFactory: new EntityMetadataFactory(),
schemaBuilder: new SchemaBuilder(),
schemaRegistry: new SchemaRegistry(new EntityMetadataFactory(), new SchemaBuilder()),
diffCalculator: createMigrateDiffCalculator($diff ?? new SchemaDiff()),
sqlGenerator: $sqlGenerator ?? createMigrateSqlGenerator(),
paths: new ProjectPaths('/test'),
Expand Down Expand Up @@ -684,8 +684,7 @@ function executeMigrateCommand(
migrationGenerator: $generator,
entityDiscovery: Helpers::createStubEntityDiscovery(),
introspector: $introspector,
metadataFactory: new EntityMetadataFactory(),
schemaBuilder: new SchemaBuilder(),
schemaRegistry: new SchemaRegistry(new EntityMetadataFactory(), new SchemaBuilder()),
diffCalculator: new DiffCalculator(),
sqlGenerator: createMigrateSqlGenerator(),
paths: new ProjectPaths('/test'),
Expand Down