fix enum update migration table/column quote

Author: pfilsx

README.md

@@ -1,9 +1,9 @@
 PostgreSQL Doctrine
 ==============
 
-[![Latest Stable Version](http://poser.pugx.org/pfilsx/postgresql-doctrine/v)](https://packagist.org/packages/pfilsx/postgresql-doctrine)
-[![PHP Version Require](http://poser.pugx.org/pfilsx/postgresql-doctrine/require/php)](https://packagist.org/packages/pfilsx/postgresql-doctrine)
-[![Total Downloads](http://poser.pugx.org/pfilsx/postgresql-doctrine/downloads)](https://packagist.org/packages/pfilsx/postgresql-doctrine)
+![Packagist Version](https://img.shields.io/packagist/v/pfilsx/postgresql-doctrine?label=latest%20stable)
+![Packagist Dependency Version](https://img.shields.io/packagist/dependency-v/pfilsx/postgresql-doctrine/php)
+![Packagist Downloads](https://img.shields.io/packagist/dt/pfilsx/postgresql-doctrine?color=0375b6)
 
 Description
 ------------

src/DBAL/DriverWrapper/PostgreSQLDriverWrapper.php

@@ -11,12 +11,11 @@
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
 use Doctrine\DBAL\Types\Type;
-use Doctrine\DBAL\VersionAwarePlatformDriver;
 use Pfilsx\PostgreSQLDoctrine\DBAL\Platform\PostgreSQLPlatform;
 use Pfilsx\PostgreSQLDoctrine\DBAL\Schema\PostgreSQLSchemaManager;
 use Pfilsx\PostgreSQLDoctrine\DBAL\Type\EnumType;
 
-final class PostgreSQLDriverWrapper implements VersionAwarePlatformDriver
+final class PostgreSQLDriverWrapper implements Driver
 {
     private Driver $innerDriver;
 
@@ -38,11 +37,6 @@ public function getDatabasePlatform(): PostgreSQLPlatform
         return new PostgreSQLPlatform();
     }
 
-    public function createDatabasePlatformForVersion($version): PostgreSQLPlatform
-    {
-        return new PostgreSQLPlatform();
-    }
-
     public function getSchemaManager(Connection $conn, AbstractPlatform $platform): AbstractSchemaManager
     {
         \assert($platform instanceof PostgreSQLPlatform);

src/DBAL/Platform/PostgreSQLPlatform.php

@@ -51,7 +51,7 @@ public function getListEnumTypesSQL(): string
     /**
      * @param EnumTypeAsset $type
      *
-     * @throws Exception\InvalidArgumentException
+     * @throws InvalidArgumentException
      *
      * @return string
      */
@@ -81,25 +81,23 @@ public function getAlterTypeSql(EnumTypeAsset $from, EnumTypeAsset $to): array
         $result = [];
         $typeName = $to->getQuotedName($this);
 
-        foreach (array_diff($toLabels, $fromLabels) as $label) {
-            $result[] = "ALTER TYPE {$typeName} ADD VALUE {$this->quoteEnumLabel($label)}";
-        }
-
         $removedLabels = array_diff($fromLabels, $toLabels);
 
         if (count($removedLabels) < 1) {
+            foreach (array_diff($toLabels, $fromLabels) as $label) {
+                $result[] = "ALTER TYPE {$typeName} ADD VALUE {$this->quoteEnumLabel($label)}";
+            }
+
             return $result;
         }
 
-        $self = $this;
-
         $result[] = "ALTER TYPE {$typeName} RENAME TO {$typeName}_old";
         $result[] = $this->getCreateTypeSql($to);
         $result[] = $this->getCommentOnTypeSql($to);
 
         foreach ($to->getUsages() as $usage) {
-            $tableName = $this->quoteIdentifier($usage->getTable());
-            $columnName = $this->quoteIdentifier($usage->getColumn());
+            $tableName = $usage->getQuotedTableName($this);
+            $columnName = $usage->getQuotedColumnName($this);
             if (($default = $usage->getDefault()) !== null) {
                 $result[] = sprintf('ALTER TABLE %s ALTER COLUMN %s DROP DEFAULT', $tableName, $columnName);
             }

src/DBAL/Schema/EnumTypeUsageAsset.php

@@ -4,6 +4,8 @@
 
 namespace Pfilsx\PostgreSQLDoctrine\DBAL\Schema;
 
+use Doctrine\DBAL\Platforms\AbstractPlatform;
+
 final class EnumTypeUsageAsset
 {
     private string $table;
@@ -12,7 +14,7 @@ final class EnumTypeUsageAsset
 
     private ?string $default;
 
-    public function __construct(string $table, string $column, string $default = null)
+    public function __construct(string $table, string $column, ?string $default = null)
     {
         $this->table = $table;
         $this->column = $column;
@@ -24,13 +26,34 @@ public function getTable(): string
         return $this->table;
     }
 
+    public function getQuotedTableName(AbstractPlatform $platform): string
+    {
+        return $this->getQuotedName($this->table, $platform);
+    }
+
     public function getColumn(): string
     {
         return $this->column;
     }
 
+    public function getQuotedColumnName(AbstractPlatform $platform): string
+    {
+        return $this->getQuotedName($this->column, $platform);
+    }
+
     public function getDefault(): ?string
     {
         return $this->default;
     }
+
+    private function getQuotedName(string $name, AbstractPlatform $platform): string
+    {
+        $keywords = $platform->getReservedKeywordsList();
+        $parts = explode('.', $name);
+        foreach ($parts as $k => $v) {
+            $parts[$k] = $keywords->isKeyword($v) ? $platform->quoteIdentifier($v) : $v;
+        }
+
+        return implode('.', $parts);
+    }
 }

src/DBAL/Schema/PostgreSQLSchemaManager.php

@@ -61,7 +61,7 @@ public function createComparator(): Comparator
         return new Comparator($this->_platform);
     }
 
-    protected function selectTableColumns(string $databaseName, string $tableName = null): Result
+    protected function selectTableColumns(string $databaseName, ?string $tableName = null): Result
     {
         $sql = 'SELECT';
 

src/DBAL/Schema/Schema.php

@@ -18,7 +18,7 @@ final class Schema extends BaseSchema
     public function __construct(
         array $tables = [],
         array $sequences = [],
-        SchemaConfig $schemaConfig = null,
+        ?SchemaConfig $schemaConfig = null,
         array $namespaces = [],
         array $types = []
     ) {

src/DBAL/Schema/SchemaDiff.php

@@ -22,7 +22,7 @@ public function __construct(
         array $createdTables = [],
         array $alteredTables = [],
         array $droppedTables = [],
-        Schema $fromSchema = null,
+        ?Schema $fromSchema = null,
         array $createdSchemas = [],
         array $droppedSchemas = [],
         array $createdSequences = [],

src/DBAL/Schema/Table.php

@@ -27,7 +27,7 @@ public function addColumn($name, $typeName, array $options = []): Column
      *
      * @return self
      */
-    public function modifyColumn($name, array $options, string $enumClass = null): self
+    public function modifyColumn($name, array $options, ?string $enumClass = null): self
     {
         $column = $this->getColumn($name);
         $column->setOptions($options);

src/DBAL/Type/EnumType.php

@@ -48,7 +48,7 @@ public function getName(): string
      *
      * @return null|int|string
      */
-    public function convertToDatabaseValue($value, AbstractPlatform $platform): null|int|string
+    public function convertToDatabaseValue($value, AbstractPlatform $platform): int|string|null
     {
         if ($value instanceof \BackedEnum) {
             return $value->value;

src/DBAL/Type/JsonModelType.php

@@ -12,7 +12,7 @@
 
 abstract class JsonModelType extends JsonType
 {
-    private null|AbstractObjectNormalizer|TraceableNormalizer $normalizer = null;
+    private AbstractObjectNormalizer|TraceableNormalizer|null $normalizer = null;
 
     abstract public static function getTypeName(): string;
 
@@ -26,7 +26,7 @@ public function getName(): string
         return static::getTypeName();
     }
 
-    public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): mixed
+    public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): ?string
     {
         if ($value === null) {
             return null;