Merge pull request #7 from N3XT0R/feature/7-schema-normalization

N3XT0R · web-flow · commit 1266ae0fb498 · 2025-07-03T22:46:42.000+02:00
Feature/7 schema normalization
diff --git a/src/Service/Generator/Compiler/Mapper/IndexMapper.php b/src/Service/Generator/Compiler/Mapper/IndexMapper.php
@@ -47,7 +47,13 @@ protected function generateIndex(IndexEntity $index): string
             $method .= "'" . $columns[0] . "'";
         }
 
-        $method .= ", '" . $index->getName() . "')";
+        $name = trim($index->getName());
+        if ($name !== '') {
+            $method .= ", '" . $name . "'";
+        }
+
+        $method .= ')';
+
         $methods = [$method];
 
         return $this->chainMethodsToString($methods);
diff --git a/src/Service/Generator/MigrationGenerator.php b/src/Service/Generator/MigrationGenerator.php
@@ -130,7 +130,6 @@ public function generateMigrationForTable(
 
             $normalizationManager = $this->getNormalizationManager();
             if ($normalizationManager) {
-                //dd($schemaResult);
                 $schemaResult = $normalizationManager->normalize($schemaResult);
             }
 
diff --git a/src/Service/Generator/Normalization/Processors/PivotProcessor.php b/src/Service/Generator/Normalization/Processors/PivotProcessor.php
@@ -3,6 +3,7 @@
 namespace N3XT0R\MigrationGenerator\Service\Generator\Normalization\Processors;
 
 use N3XT0R\MigrationGenerator\Service\Generator\Definition\Entity\FieldEntity;
+use N3XT0R\MigrationGenerator\Service\Generator\Definition\Entity\IndexEntity;
 use N3XT0R\MigrationGenerator\Service\Generator\Definition\Entity\PrimaryKeyEntity;
 use N3XT0R\MigrationGenerator\Service\Generator\Definition\Entity\ResultEntity;
 use N3XT0R\MigrationGenerator\Service\Generator\Normalization\Context\NormalizationContext;
@@ -21,26 +22,63 @@ public function process(NormalizationContext $context): ResultEntity
         $results = $result->getResults();
 
         foreach ($results as $tableName => $definitions) {
+            if (!isset($definitions['primaryKey'])) {
+                continue;
+            }
+
+            /** @var PrimaryKeyEntity|null $primary */
             $primary = current($definitions['primaryKey']);
-            if ($primary instanceof PrimaryKeyEntity && count($primary->getColumns()) >= 2) {
-                $idField = new FieldEntity();
-                $idField->setTable($tableName);
-                $idField->setType('bigInteger');
-                $idField->setArguments(['autoIncrement' => true]);
-                $idField->setOptions([
-                    'default' => null,
-                    'unsigned' => true,
-                    'nullable' => false
-                ]);
-
-                $idField->setColumnName('id');
-                $results[$tableName]['table'] = ['id' => $idField, ...$definitions['table']];
-                unset($results[$tableName]['primaryKey']);
+            if (!$this->isCompositePrimaryKey($primary)) {
+                continue;
             }
+
+            $results[$tableName] = $this->transformPivotTable($tableName, $definitions, $primary);
         }
 
         $result->setResults($results);
         $context->update($result);
+
         return $result;
     }
+
+    protected function isCompositePrimaryKey(?PrimaryKeyEntity $primary): bool
+    {
+        return $primary instanceof PrimaryKeyEntity && count($primary->getColumns()) >= 2;
+    }
+
+    protected function transformPivotTable(string $tableName, array $definitions, PrimaryKeyEntity $primary): array
+    {
+        $definitions['table'] = $this->prependIdField($tableName, $definitions['table']);
+        unset($definitions['primaryKey']);
+        $definitions['index'][] = $this->createUniqueIndexFromPrimaryKey($primary);
+
+        return $definitions;
+    }
+
+    protected function prependIdField(string $tableName, array $fields): array
+    {
+        $idField = new FieldEntity();
+        $idField->setTable($tableName);
+        $idField->setType('bigInteger');
+        $idField->setArguments(['autoIncrement' => true]);
+        $idField->setOptions([
+            'default' => null,
+            'unsigned' => true,
+            'nullable' => false,
+        ]);
+        $idField->setColumnName('id');
+
+        return ['id' => $idField] + $fields;
+    }
+
+    protected function createUniqueIndexFromPrimaryKey(PrimaryKeyEntity $primary): IndexEntity
+    {
+        $index = new IndexEntity();
+        $index->setType('unique');
+        $index->setIndexType('index');
+        $index->setColumns($primary->getColumns());
+        $index->setName(implode('_', $primary->getColumns()) . '_unique');
+
+        return $index;
+    }
 }
diff --git a/tests/Unit/Generator/Compiler/Mapper/AbstractMapperTest.php b/tests/Unit/Generator/Compiler/Mapper/AbstractMapperTest.php
@@ -6,7 +6,7 @@
 
 use N3XT0R\MigrationGenerator\Service\Generator\Compiler\Mapper\AbstractMapper;
 use PHPUnit\Framework\Attributes\DataProvider;
-use Tests\TestCase;
+use PHPUnit\Framework\TestCase;
 
 class AbstractMapperTest extends TestCase
 {
@@ -45,8 +45,8 @@ public static function chainMethodProvider(): array
     }
 
     /**
-     * @param  array  $methods
-     * @param  string  $expectedResult
+     * @param array $methods
+     * @param string $expectedResult
      */
     #[DataProvider('chainMethodProvider')]
     public function testChainMethodsToStringWorks(array $methods, string $expectedResult): void
diff --git a/tests/Unit/Generator/Compiler/Mapper/FieldMapperTest.php b/tests/Unit/Generator/Compiler/Mapper/FieldMapperTest.php
@@ -7,7 +7,7 @@
 use N3XT0R\MigrationGenerator\Service\Generator\Compiler\Mapper\FieldMapper;
 use N3XT0R\MigrationGenerator\Service\Generator\Definition\Entity\FieldEntity;
 use PHPUnit\Framework\Attributes\DataProvider;
-use Tests\TestCase;
+use PHPUnit\Framework\TestCase;
 
 class FieldMapperTest extends TestCase
 {
diff --git a/tests/Unit/Generator/Compiler/Mapper/ForeignKeyMapperTest.php b/tests/Unit/Generator/Compiler/Mapper/ForeignKeyMapperTest.php
@@ -6,7 +6,7 @@
 
 use N3XT0R\MigrationGenerator\Service\Generator\Compiler\Mapper\ForeignKeyMapper;
 use N3XT0R\MigrationGenerator\Service\Generator\Definition\Entity\ForeignKeyEntity;
-use Tests\TestCase;
+use PHPUnit\Framework\TestCase;
 
 class ForeignKeyMapperTest extends TestCase
 {
diff --git a/tests/Unit/Generator/Compiler/Mapper/IndexMapperTest.php b/tests/Unit/Generator/Compiler/Mapper/IndexMapperTest.php
@@ -6,7 +6,7 @@
 
 use N3XT0R\MigrationGenerator\Service\Generator\Compiler\Mapper\IndexMapper;
 use N3XT0R\MigrationGenerator\Service\Generator\Definition\Entity\IndexEntity;
-use Tests\TestCase;
+use PHPUnit\Framework\TestCase;
 
 class IndexMapperTest extends TestCase
 {
diff --git a/tests/Unit/Generator/Definition/AbstractDefinitionTest.php b/tests/Unit/Generator/Definition/AbstractDefinitionTest.php
@@ -40,8 +40,8 @@ public function testSetAndGetResultAreSame(): void
     }
 
     /**
-     * @param  string  $attributeName
-     * @param  bool  $expectedResult
+     * @param string $attributeName
+     * @param bool $expectedResult
      * @testWith ["test", true]
      *           ["test2", false]
      */
@@ -78,7 +78,7 @@ public function testSetAndGetSchemaAreSame(): void
     }
 
     /**
-     * @param  bool  $expectedResult
+     * @param bool $expectedResult
      * @testWith    [true]
      *              [false]
      */
diff --git a/tests/Unit/Generator/Definition/Entity/AbstractIndexEntityTest.php b/tests/Unit/Generator/Definition/Entity/AbstractIndexEntityTest.php
@@ -3,7 +3,7 @@
 namespace Generator\Definition\Entity;
 
 use N3XT0R\MigrationGenerator\Service\Generator\Definition\Entity\AbstractIndexEntity;
-use Tests\TestCase;
+use PHPUnit\Framework\TestCase;
 
 class AbstractIndexEntityTest extends TestCase
 {
diff --git a/tests/Unit/Generator/Definition/Entity/FieldEntityTest.php b/tests/Unit/Generator/Definition/Entity/FieldEntityTest.php
@@ -5,7 +5,7 @@
 
 
 use N3XT0R\MigrationGenerator\Service\Generator\Definition\Entity\FieldEntity;
-use Tests\TestCase;
+use PHPUnit\Framework\TestCase;
 
 class FieldEntityTest extends TestCase
 {
diff --git a/tests/Unit/Generator/Definition/Entity/ForeignKeyEntityTest.php b/tests/Unit/Generator/Definition/Entity/ForeignKeyEntityTest.php
@@ -5,7 +5,7 @@
 
 
 use N3XT0R\MigrationGenerator\Service\Generator\Definition\Entity\ForeignKeyEntity;
-use Tests\TestCase;
+use PHPUnit\Framework\TestCase;
 
 class ForeignKeyEntityTest extends TestCase
 {
diff --git a/tests/Unit/Generator/Definition/Entity/PrimaryKeyDefinitionTest.php b/tests/Unit/Generator/Definition/Entity/PrimaryKeyDefinitionTest.php
@@ -3,7 +3,7 @@
 namespace Generator\Definition\Entity;
 
 use N3XT0R\MigrationGenerator\Service\Generator\Definition\Entity\PrimaryKeyEntity;
-use Tests\TestCase;
+use PHPUnit\Framework\TestCase;
 
 class PrimaryKeyDefinitionTest extends TestCase
 {
diff --git a/tests/Unit/Generator/Definition/Entity/ResultEntityTest.php b/tests/Unit/Generator/Definition/Entity/ResultEntityTest.php
@@ -5,7 +5,7 @@
 
 
 use N3XT0R\MigrationGenerator\Service\Generator\Definition\Entity\ResultEntity;
-use Tests\TestCase;
+use PHPUnit\Framework\TestCase;
 
 class ResultEntityTest extends TestCase
 {
diff --git a/tests/Unit/Generator/Normalization/Context/NormalizationContextTest.php b/tests/Unit/Generator/Normalization/Context/NormalizationContextTest.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace Tests\Unit\Normalization\Context;
+
+use N3XT0R\MigrationGenerator\Service\Generator\Definition\Entity\ResultEntity;
+use N3XT0R\MigrationGenerator\Service\Generator\Normalization\Context\NormalizationContext;
+use PHPUnit\Framework\TestCase;
+
+class NormalizationContextTest extends TestCase
+{
+    public function testInitialStateIsConsistent(): void
+    {
+        $entity = new ResultEntity();
+        $entity->setTableName('test');
+        $entity->setResults(['test' => ['foo' => 'bar']]);
+
+        $context = new NormalizationContext($entity);
+
+        $this->assertSame($entity, $context->getCurrent());
+        $this->assertNotSame($entity, $context->getOriginal());
+        $this->assertNotSame($entity, $context->getPrevious());
+
+        $this->assertEquals($entity->getResults(), $context->getOriginal()->getResults());
+        $this->assertEquals($entity->getResults(), $context->getPrevious()->getResults());
+    }
+
+    public function testUpdateSetsPreviousAndCurrent(): void
+    {
+        $initial = new ResultEntity();
+        $initial->setResults(['t1' => ['a' => 1]]);
+        $context = new NormalizationContext($initial);
+
+        $updated = new ResultEntity();
+        $updated->setResults(['t1' => ['a' => 2]]);
+        $context->update($updated);
+
+        $this->assertSame($updated, $context->getCurrent());
+        $this->assertNotSame($updated, $context->getPrevious());
+        $this->assertEquals(['a' => 1], $context->getPrevious()->getResults()['t1']);
+        $this->assertEquals(['a' => 2], $context->getCurrent()->getResults()['t1']);
+    }
+
+    public function testGetTableResultsReturnsExpectedData(): void
+    {
+        $entity = new ResultEntity();
+        $entity->setResults([
+            'users' => ['id' => 'field'],
+            'posts' => ['id' => 'field']
+        ]);
+
+        $context = new NormalizationContext($entity);
+
+        $this->assertEquals(['id' => 'field'], $context->getTableResults('users'));
+        $this->assertEquals([], $context->getTableResults('nonExisting'));
+    }
+
+    public function testHasChangedDetectsDifference(): void
+    {
+        $entity = new ResultEntity();
+        $entity->setResults(['table' => ['a' => 1]]);
+        $context = new NormalizationContext($entity);
+
+        $this->assertFalse($context->hasChanged());
+
+        $modified = new ResultEntity();
+        $modified->setResults(['table' => ['a' => 2]]);
+        $context->update($modified);
+
+        $this->assertTrue($context->hasChanged());
+    }
+
+    public function testDiffTableDetectsAddedAndRemovedKeys(): void
+    {
+        $entity = new ResultEntity();
+        $entity->setResults(['example' => ['a' => 1, 'b' => 2]]);
+
+        $context = new NormalizationContext($entity);
+
+        $modified = new ResultEntity();
+        $modified->setResults(['example' => ['b' => 2, 'c' => 3]]);
+        $context->update($modified);
+
+        $diff = $context->diffTable('example');
+        $this->assertEquals(['c'], $diff['added_keys']);
+        $this->assertEquals(['a'], $diff['removed_keys']);
+    }
+}
diff --git a/tests/Unit/Generator/Normalization/Processors/PivotProcessorTest.php b/tests/Unit/Generator/Normalization/Processors/PivotProcessorTest.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace Generator\Normalization\Processors;
+
+use N3XT0R\MigrationGenerator\Service\Generator\Definition\Entity\FieldEntity;
+use N3XT0R\MigrationGenerator\Service\Generator\Definition\Entity\PrimaryKeyEntity;
+use N3XT0R\MigrationGenerator\Service\Generator\Definition\Entity\ResultEntity;
+use N3XT0R\MigrationGenerator\Service\Generator\Normalization\Context\NormalizationContext;
+use N3XT0R\MigrationGenerator\Service\Generator\Normalization\Processors\PivotProcessor;
+use N3XT0R\MigrationGenerator\Service\Generator\Normalization\Processors\ProcessorInterface;
+use PHPUnit\Framework\TestCase;
+
+class PivotProcessorTest extends TestCase
+{
+    protected ProcessorInterface $processor;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->processor = new PivotProcessor();
+    }
+
+    public function test_pivot_processor_replaces_primary_with_id_and_adds_unique_index(): void
+    {
+        $pk = new PrimaryKeyEntity();
+        $pk->setColumns(['role_id', 'user_id']);
+
+        $roleId = new FieldEntity();
+        $roleId->setType('bigInteger');
+        $roleId->setColumnName('role_id');
+        $roleId->setOptions(['nullable' => false, 'unsigned' => true, 'default' => null]);
+
+        $userId = new FieldEntity();
+        $userId->setType('bigInteger');
+        $userId->setColumnName('user_id');
+        $userId->setOptions(['nullable' => false, 'unsigned' => true, 'default' => null]);
+
+        $result = new ResultEntity();
+        $result->setTableName('role_customer');
+        $result->setResults([
+            'role_customer' => [
+                'table' => [
+                    'role_id' => $roleId,
+                    'user_id' => $userId,
+                ],
+                'primaryKey' => ['PRIMARY' => $pk],
+            ],
+        ]);
+
+        $context = new NormalizationContext($result);
+        $table = (new PivotProcessor())->process($context)->getResultByTable('role_customer');
+
+        $this->assertArrayHasKey('id', $table['table']);
+        $this->assertArrayNotHasKey('primaryKey', $table);
+        $this->assertNotEmpty($table['index']);
+
+        $unique = array_filter($table['index'], fn($i) => $i->getType() === 'unique');
+        $this->assertSame(['role_id', 'user_id'], array_values($unique)[0]->getColumns());
+    }
+
+
+}
diff --git a/tests/Unit/Sort/TopSortTest.php b/tests/Unit/Sort/TopSortTest.php
@@ -5,7 +5,7 @@
 
 
 use N3XT0R\MigrationGenerator\Service\Generator\Sort\TopSort;
-use Tests\TestCase;
+use PHPUnit\Framework\TestCase;
 
 class TopSortTest extends TestCase
 {

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,6 @@ public function generateMigrationForTable(`
`130`	`130`
`131`	`131`	`$normalizationManager = $this->getNormalizationManager();`
`132`	`132`	`if ($normalizationManager) {`
`133`		`- //dd($schemaResult);`
`134`	`133`	`$schemaResult = $normalizationManager->normalize($schemaResult);`
`135`	`134`	`}`
`136`	`135`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`use N3XT0R\MigrationGenerator\Service\Generator\Compiler\Mapper\FieldMapper;`
`8`	`8`	`use N3XT0R\MigrationGenerator\Service\Generator\Definition\Entity\FieldEntity;`
`9`	`9`	`use PHPUnit\Framework\Attributes\DataProvider;`
`10`		`-use Tests\TestCase;`
	`10`	`+use PHPUnit\Framework\TestCase;`
`11`	`11`
`12`	`12`	`class FieldMapperTest extends TestCase`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`use N3XT0R\MigrationGenerator\Service\Generator\Compiler\Mapper\ForeignKeyMapper;`
`8`	`8`	`use N3XT0R\MigrationGenerator\Service\Generator\Definition\Entity\ForeignKeyEntity;`
`9`		`-use Tests\TestCase;`
	`9`	`+use PHPUnit\Framework\TestCase;`
`10`	`10`
`11`	`11`	`class ForeignKeyMapperTest extends TestCase`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`namespace Generator\Definition\Entity;`
`4`	`4`
`5`	`5`	`use N3XT0R\MigrationGenerator\Service\Generator\Definition\Entity\AbstractIndexEntity;`
`6`		`-use Tests\TestCase;`
	`6`	`+use PHPUnit\Framework\TestCase;`
`7`	`7`
`8`	`8`	`class AbstractIndexEntityTest extends TestCase`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`
`7`	`7`	`use N3XT0R\MigrationGenerator\Service\Generator\Definition\Entity\FieldEntity;`
`8`		`-use Tests\TestCase;`
	`8`	`+use PHPUnit\Framework\TestCase;`
`9`	`9`
`10`	`10`	`class FieldEntityTest extends TestCase`
`11`	`11`	`{`