Fixes for postgres compat

Author: TimeToogo

src/Persistence/Db/Doctrine/Migration/CustomColumnDefinitionEventSubscriber.php

@@ -26,7 +26,7 @@ public function getSubscribedEvents()
 
     public function onSchemaColumnDefinition(SchemaColumnDefinitionEventArgs $event)
     {
-        $fieldType = $event->getTableColumn()['Type'];
+        $fieldType = $event->getTableColumn()['Type'] ?? $event->getTableColumn()['type'];
 
         if (stripos($fieldType, 'enum(') !== false) {
             $fieldValues = $this->parseEnumTypeToValues($fieldType);

src/Persistence/Db/Doctrine/Migration/DoctrineSchemaConverter.php

@@ -13,6 +13,8 @@
 use Dms\Core\Persistence\Db\Schema\Table;
 use Dms\Core\Persistence\Db\Schema\Type;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\DBAL\Platforms\MySqlPlatform;
 use Doctrine\DBAL\Schema\Table as DoctrineTable;
 use Doctrine\DBAL\Types\Type as DoctrineType;
 
@@ -28,26 +30,27 @@ class DoctrineSchemaConverter
      * Converts the database to the equivalent doctrine schema.
      *
      * @param Database $database
+     * @param AbstractPlatform $platform
      *
      * @return Schema
      */
-    public function convertToDoctrineSchema(Database $database) : \Doctrine\DBAL\Schema\Schema
+    public function convertToDoctrineSchema(Database $database, AbstractPlatform $platform) : \Doctrine\DBAL\Schema\Schema
     {
         $schema = new Schema();
 
         foreach ($database->getTables() as $table) {
-            $this->mapTable($schema, $table);
+            $this->mapTable($schema, $table, $platform);
         }
 
         return $schema;
     }
 
-    private function mapTable(Schema $schema, Table $table)
+    private function mapTable(Schema $schema, Table $table, AbstractPlatform $platform)
     {
         $doctrineTable = $schema->createTable($table->getName());
 
         foreach ($table->getColumns() as $column) {
-            $this->mapColumn($doctrineTable, $column);
+            $this->mapColumn($doctrineTable, $column, $platform);
         }
 
         if ($table->hasPrimaryKeyColumn()) {
@@ -102,9 +105,9 @@ private function mapForeignKeyMode($mode)
         ForeignKeyMode::validate($mode);
     }
 
-    private function mapColumn(DoctrineTable $doctrineTable, Column $column)
+    private function mapColumn(DoctrineTable $doctrineTable, Column $column, AbstractPlatform $platform)
     {
-        list($typeName, $options) = $this->mapColumnType($column->getType());
+        list($typeName, $options) = $this->mapColumnType($column->getType(), $platform);
 
         $doctrineTable->addColumn(
                 $column->getName(),
@@ -113,7 +116,7 @@ private function mapColumn(DoctrineTable $doctrineTable, Column $column)
         );
     }
 
-    private function mapColumnType(Type\Type $type)
+    private function mapColumnType(Type\Type $type, AbstractPlatform $platform)
     {
         $options = [];
 
@@ -142,9 +145,14 @@ private function mapColumnType(Type\Type $type)
 
                 return [DoctrineType::DECIMAL, $options];
 
-            case $type instanceof Type\Enum:
+            case $type instanceof Type\Enum && $platform instanceof MySqlPlatform:
                 return [CustomEnumTypeGenerator::generate($type->getOptions()), $options];
 
+            case $type instanceof Type\Enum:
+                $options['length'] = 255;
+
+                return [DoctrineType::STRING, $options];
+
             case $type instanceof Type\Integer:
                 $options['autoincrement'] = $type->isAutoIncrement();
                 $options['unsigned']      = $type->isUnsigned();

src/Persistence/Db/Doctrine/Migration/MigrationGenerator.php

@@ -7,6 +7,7 @@
 use Dms\Core\Persistence\Db\Mapping\IOrm;
 use Doctrine\DBAL\Schema\Comparator;
 use Doctrine\DBAL\Schema\SchemaDiff;
+use Doctrine\DBAL\Platforms\MySqlPlatform;
 
 /**
  * The migration generator base class.
@@ -40,11 +41,13 @@ public function generateMigration(DoctrineConnection $connection, IOrm $orm, str
     {
         $doctrine = $connection->getDoctrineConnection();
 
-        $doctrine->getDatabasePlatform()->registerDoctrineTypeMapping('enum', 'string');
-        $doctrine->getEventManager()->addEventSubscriber(new CustomColumnDefinitionEventSubscriber());
+        if ($doctrine->getDatabasePlatform() instanceof MySqlPlatform) {
+            $doctrine->getDatabasePlatform()->registerDoctrineTypeMapping('enum', 'string');
+            $doctrine->getEventManager()->addEventSubscriber(new CustomColumnDefinitionEventSubscriber());
+        }
 
         $currentSchema  = $doctrine->getSchemaManager()->createSchema();
-        $expectedSchema = $this->databaseConverter->convertToDoctrineSchema($orm->getDatabase());
+        $expectedSchema = $this->databaseConverter->convertToDoctrineSchema($orm->getDatabase(), $doctrine->getDatabasePlatform());
 
         $diff        = Comparator::compareSchemas($currentSchema, $expectedSchema);
         $reverseDiff = Comparator::compareSchemas($expectedSchema, $currentSchema);

tests/Tests/Persistence/Db/Doctrine/Migration/DoctrineSchemaConverterTest.php

@@ -4,6 +4,8 @@
 
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\DBAL\Platforms\MySqlPlatform;
 use Dms\Common\Testing\CmsTestCase;
 use Dms\Core\Persistence\Db\Doctrine\Migration\CustomEnumTypeGenerator;
 use Dms\Core\Persistence\Db\Doctrine\Migration\DoctrineSchemaConverter;
@@ -40,6 +42,7 @@ public function expectedConversions()
                 [new Database([]), new Schema()],
                 $this->tablesTest(),
                 $this->columnTypesTest(),
+                $this->enumForNonMySqlPlatform(),
                 $this->foreignKeysTest(),
                 $this->indexesTest(),
         ];
@@ -48,10 +51,10 @@ public function expectedConversions()
     /**
      * @dataProvider expectedConversions
      */
-    public function testConvertsDatabaseCorrectly(Database $originalDb, Schema $expectedDoctrineSchema)
+    public function testConvertsDatabaseCorrectly(Database $originalDb, Schema $expectedDoctrineSchema, string $platformClass = AbstractPlatform::class)
     {
         $converter            = new DoctrineSchemaConverter();
-        $actualDoctrineSchema = $converter->convertToDoctrineSchema($originalDb);
+        $actualDoctrineSchema = $converter->convertToDoctrineSchema($originalDb, $this->getMockForAbstractClass($platformClass));
 
         $this->assertEquals($expectedDoctrineSchema, $actualDoctrineSchema);
     }
@@ -150,7 +153,25 @@ private function columnTypesTest()
         $testTable->addColumn('blob_medium', Type::BLOB)->setLength(pow(2, 24) - 1);
         $testTable->addColumn('blob_long', Type::BLOB)->setLength(pow(2, 32) - 1);
 
-        return [$original, $expected];
+        return [$original, $expected, MySqlPlatform::class];
+    }
+
+    private function enumForNonMySqlPlatform()
+    {
+        $original = new Database([
+                new Table('test', [
+                        new Column('enum_abc', new Enum(['a', 'b', 'c'])),
+                        new Column('enum_123', new Enum(['1', '2', '3'])),
+                ])
+        ]);
+
+        $expected  = new Schema();
+        $testTable = $expected->createTable('test');
+
+        $testTable->addColumn('enum_abc', Type::STRING)->setLength(255);
+        $testTable->addColumn('enum_123', Type::STRING)->setLength(255);
+
+        return [$original, $expected, AbstractPlatform::class];
     }
 
     public function foreignKeysTest()