update default doctrine methods

Author: pfilsx

src/DBAL/Platform/PostgreSQLPlatform.php

@@ -153,6 +153,16 @@ public function columnsEqual(Column $column1, Column $column2): bool
         return is_subclass_of($type1, $type2::class) || is_subclass_of($type2, $type1::class);
     }
 
+    public function getDefaultColumnValueSQLSnippet(): string
+    {
+        return <<<'SQL'
+             SELECT pg_get_expr(adbin, adrelid)
+             FROM pg_attrdef
+             WHERE c.oid = pg_attrdef.adrelid
+                AND pg_attrdef.adnum=a.attnum
+        SQL;
+    }
+
     protected function initializeDoctrineTypeMappings(): void
     {
         parent::initializeDoctrineTypeMappings();

src/DBAL/Schema/PostgreSQLSchemaManager.php

@@ -69,7 +69,7 @@ protected function selectTableColumns(string $databaseName, ?string $tableName =
             $sql .= ' c.relname AS table_name, n.nspname AS schema_name,';
         }
 
-        $sql .= <<<'SQL'
+        $sql .= sprintf(<<<'SQL'
             a.attnum,
             quote_ident(a.attname) AS field,
             t.typname AS type,
@@ -85,11 +85,7 @@ protected function selectTableColumns(string $databaseName, ?string $tableName =
                 AND pg_index.indkey[0] = a.attnum
                 AND pg_index.indisprimary = 't'
             ) AS pri,
-            (SELECT pg_get_expr(adbin, adrelid)
-             FROM pg_attrdef
-             WHERE c.oid = pg_attrdef.adrelid
-                AND pg_attrdef.adnum=a.attnum
-            ) AS default,
+            (%s) AS default,
             (SELECT pg_description.description
                 FROM pg_description WHERE pg_description.objoid = c.oid AND a.attnum = pg_description.objsubid
             ) AS comment,
@@ -105,7 +101,8 @@ protected function selectTableColumns(string $databaseName, ?string $tableName =
                 LEFT JOIN pg_depend d
                     ON d.objid = c.oid
                         AND d.deptype = 'e'
-SQL;
+                        AND d.classid = (SELECT oid FROM pg_class WHERE relname = 'pg_class')
+SQL, $this->_platform->getDefaultColumnValueSQLSnippet());
 
         $conditions = array_merge([
             'a.attnum > 0',
@@ -213,6 +210,7 @@ protected function _getPortableTableColumnDefinition($tableColumn): Column
 
                 break;
 
+            case 'json':
             case 'text':
             case '_varchar':
             case 'varchar':
@@ -302,7 +300,7 @@ protected function _getPortableTableColumnDefinition($tableColumn): Column
             }
         }
 
-        if (isset($tableColumn['collation']) && !empty($tableColumn['collation'])) {
+        if (!empty($tableColumn['collation'])) {
             $column->setPlatformOption('collation', $tableColumn['collation']);
         }
 

src/Tools/SchemaTool.php

@@ -9,6 +9,7 @@
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
 use Doctrine\DBAL\Schema\Index;
 use Doctrine\DBAL\Schema\SchemaException;
+use Doctrine\DBAL\Schema\Sequence;
 use Doctrine\DBAL\Schema\Visitor\RemoveNamespacedAssets;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\ClassMetadata;
@@ -226,10 +227,11 @@ static function (ClassMetadata $class) use ($idMapping): bool {
 
             if (isset($class->table['uniqueConstraints'])) {
                 foreach ($class->table['uniqueConstraints'] as $indexName => $indexData) {
-                    $uniqIndex = new Index($indexName, $this->getIndexColumns($class, $indexData), true, false, [], $indexData['options'] ?? []);
+                    $uniqIndex = new Index('tmp__' . $indexName, $this->getIndexColumns($class, $indexData), true, false, [], $indexData['options'] ?? []);
 
                     foreach ($table->getIndexes() as $tableIndexName => $tableIndex) {
-                        if ($tableIndex->isFullfilledBy($uniqIndex)) {
+                        $method = method_exists($tableIndex, 'isFulfilledBy') ? 'isFulfilledBy' : 'isFullfilledBy';
+                        if ($tableIndex->$method($uniqIndex)) {
                             $table->dropIndex($tableIndexName);
 
                             break;
@@ -270,16 +272,23 @@ static function (ClassMetadata $class) use ($idMapping): bool {
             $this->gatherEnumTypes($class, $schema);
         }
 
+        if (!$this->platform->supportsSchemas()) {
+            $filter = /** @param Sequence|Table $asset */ static function ($asset) use ($schema): bool {
+                return !$asset->isInDefaultNamespace($schema->getName());
+            };
+
+            if (array_filter($schema->getSequences() + $schema->getTables(), $filter) && !$this->platform->canEmulateSchemas()) {
+                $schema->visit(new RemoveNamespacedAssets());
+            }
+        }
+
+        // remove default namespace creation from down migration
         foreach ($this->schemaManager->getExistingSchemaSearchPaths() as $namespace) {
             if (!$schema->hasNamespace($namespace)) {
                 $schema->createNamespace($namespace);
             }
         }
 
-        if (!$this->platform->supportsSchemas() && !$this->platform->canEmulateSchemas()) {
-            $schema->visit(new RemoveNamespacedAssets());
-        }
-
         if ($eventManager->hasListeners(ToolEvents::postGenerateSchema)) {
             $eventManager->dispatchEvent(
                 ToolEvents::postGenerateSchema,
@@ -412,7 +421,7 @@ private function gatherColumnOptions(array $mapping): array
         }
 
         $options = array_intersect_key($mappingOptions, array_flip(self::KNOWN_COLUMN_OPTIONS));
-        $options['customSchemaOptions'] = array_diff_key($mappingOptions, $options);
+        $options['platformOptions'] = array_diff_key($mappingOptions, $options);
 
         return $options;
     }
@@ -689,6 +698,7 @@ private function addDiscriminatorColumnDefinition(ClassMetadata $class, Table $t
             $options['columnDefinition'] = $discrColumn['columnDefinition'];
         }
 
+        $options = $this->gatherColumnOptions($discrColumn) + $options;
         $table->addColumn($discrColumn['name'], $discrColumn['type'], $options);
     }