Merge branch '3.9.x' into 4.1.x

* 3.9.x:
  fix doctrine#6198:  stop considering generated column definition as being its default value (doctrine#6199)
  Fix condition on Ascii String for SQL Server (doctrine#6389)
  Add DBTypes that are missing for TypeMapping (doctrine#6463)

Author: derrabus

src/Driver/AbstractPostgreSQLDriver.php

@@ -7,16 +7,39 @@
 use Doctrine\DBAL\Driver;
 use Doctrine\DBAL\Driver\API\ExceptionConverter as ExceptionConverterInterface;
 use Doctrine\DBAL\Driver\API\PostgreSQL\ExceptionConverter;
+use Doctrine\DBAL\Platforms\Exception\InvalidPlatformVersion;
+use Doctrine\DBAL\Platforms\PostgreSQL120Platform;
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use Doctrine\DBAL\ServerVersionProvider;
 
+use function preg_match;
+use function version_compare;
+
 /**
  * Abstract base implementation of the {@see Driver} interface for PostgreSQL based drivers.
  */
 abstract class AbstractPostgreSQLDriver implements Driver
 {
     public function getDatabasePlatform(ServerVersionProvider $versionProvider): PostgreSQLPlatform
     {
+        $version = $versionProvider->getServerVersion();
+
+        if (preg_match('/^(?P<major>\d+)(?:\.(?P<minor>\d+)(?:\.(?P<patch>\d+))?)?/', $version, $versionParts) === 0) {
+            throw InvalidPlatformVersion::new(
+                $version,
+                '<major_version>.<minor_version>.<patch_version>',
+            );
+        }
+
+        $majorVersion = $versionParts['major'];
+        $minorVersion = $versionParts['minor'] ?? 0;
+        $patchVersion = $versionParts['patch'] ?? 0;
+        $version      = $majorVersion . '.' . $minorVersion . '.' . $patchVersion;
+
+        if (version_compare($version, '12.0', '>=')) {
+            return new PostgreSQL120Platform();
+        }
+
         return new PostgreSQLPlatform();
     }
 

src/Platforms/PostgreSQL120Platform.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Platforms;
+
+/**
+ * Provides the behavior, features and SQL dialect of the PostgreSQL 12.0 database platform.
+ */
+class PostgreSQL120Platform extends PostgreSQLPlatform
+{
+    public function getDefaultColumnValueSQLSnippet(): string
+    {
+        // in case of GENERATED ALWAYS AS (foobar) STORED column (added in PostgreSQL 12.0)
+        // PostgreSQL's pg_get_expr(adbin, adrelid) will return the 'foobar' part
+        // which is not the 'default' value of the column but its 'definition'
+        // so in that case we force it to NULL as DBAL will use that column only for the
+        // 'default' value
+        return <<<'SQL'
+            SELECT
+                CASE
+                    WHEN a.attgenerated = 's' THEN NULL
+                    ELSE pg_get_expr(adbin, adrelid)
+                END
+             FROM pg_attrdef
+             WHERE c.oid = pg_attrdef.adrelid
+                AND pg_attrdef.adnum=a.attnum
+        SQL;
+    }
+}

src/Platforms/PostgreSQLPlatform.php

@@ -676,6 +676,19 @@ public function getTruncateTableSQL(string $tableName, bool $cascade = false): s
         return $sql;
     }
 
+    /**
+     * Get the snippet used to retrieve the default value for a given column
+     */
+    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
     {
         $this->doctrineTypeMapping = [

src/Platforms/SQLServerPlatform.php

@@ -1080,12 +1080,14 @@ protected function initializeDoctrineTypeMappings(): void
             'smalldatetime'    => Types::DATETIME_MUTABLE,
             'smallint'         => Types::SMALLINT,
             'smallmoney'       => Types::INTEGER,
+            'sysname'          => Types::STRING,
             'text'             => Types::TEXT,
             'time'             => Types::TIME_MUTABLE,
             'tinyint'          => Types::SMALLINT,
             'uniqueidentifier' => Types::GUID,
             'varbinary'        => Types::BINARY,
             'varchar'          => Types::STRING,
+            'xml'              => Types::TEXT,
         ];
     }
 

src/Schema/PostgreSQLSchemaManager.php

@@ -417,7 +417,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,
@@ -434,11 +434,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
@@ -453,7 +449,7 @@ protected function selectTableColumns(string $databaseName, ?string $tableName =
                     ON d.objid = c.oid
                         AND d.deptype = 'e'
                         AND d.classid = (SELECT oid FROM pg_class WHERE relname = 'pg_class')
-SQL;
+            SQL, $this->platform->getDefaultColumnValueSQLSnippet());
 
         $conditions = array_merge([
             'a.attnum > 0',

tests/Driver/VersionAwarePlatformDriverTest.php

@@ -14,6 +14,7 @@
 use Doctrine\DBAL\Platforms\MySQL80Platform;
 use Doctrine\DBAL\Platforms\MySQL84Platform;
 use Doctrine\DBAL\Platforms\MySQLPlatform;
+use Doctrine\DBAL\Platforms\PostgreSQL120Platform;
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
@@ -69,7 +70,8 @@ public static function postgreSQLVersionProvider(): array
         return [
             ['10.0', PostgreSQLPlatform::class],
             ['11.0', PostgreSQLPlatform::class],
-            ['13.3', PostgreSQLPlatform::class],
+            ['12.0', PostgreSQL120Platform::class],
+            ['13.3', PostgreSQL120Platform::class],
         ];
     }
 

tests/Functional/Schema/PostgreSQLSchemaManagerTest.php

@@ -5,6 +5,7 @@
 namespace Doctrine\DBAL\Tests\Functional\Schema;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\DBAL\Platforms\PostgreSQL120Platform;
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use Doctrine\DBAL\Schema\ForeignKeyConstraint;
 use Doctrine\DBAL\Schema\Schema;
@@ -290,6 +291,31 @@ public function testBooleanDefault(): void
         );
     }
 
+    public function testGeneratedColumn(): void
+    {
+        if (! $this->connection->getDatabasePlatform() instanceof PostgreSQL120Platform) {
+             self::markTestSkipped('Generated columns are not supported in Postgres 11 and earlier');
+        }
+
+        $table = new Table('ddc6198_generated_always_as');
+        $table->addColumn('id', Types::INTEGER);
+        $table->addColumn(
+            'idIsOdd',
+            Types::BOOLEAN,
+            ['columnDefinition' => 'boolean GENERATED ALWAYS AS (id % 2 = 1) STORED', 'notNull' => false],
+        );
+
+        $this->dropAndCreateTable($table);
+
+        $databaseTable = $this->schemaManager->introspectTable($table->getName());
+
+        self::assertTrue(
+            $this->schemaManager->createComparator()
+                ->compareTables($table, $databaseTable)
+                ->isEmpty(),
+        );
+    }
+
     /**
      * PostgreSQL stores BINARY columns as BLOB
      */

tests/Platforms/SQLServerPlatformTest.php

@@ -127,6 +127,34 @@ public function testGeneratesTypeDeclarationsForStrings(): void
         );
     }
 
+    public function testGeneratesTypeDeclarationsForAsciiStrings(): void
+    {
+        self::assertEquals(
+            'CHAR(10)',
+            $this->platform->getAsciiStringTypeDeclarationSQL(
+                ['length' => 10, 'fixed' => true],
+            ),
+        );
+        self::assertEquals(
+            'VARCHAR(50)',
+            $this->platform->getAsciiStringTypeDeclarationSQL(['length' => 50]),
+        );
+        self::assertEquals(
+            'VARCHAR(50)',
+            $this->platform->getAsciiStringTypeDeclarationSQL(
+                ['length' => 50, 'fixed' => false],
+            ),
+        );
+        self::assertEquals(
+            'VARCHAR(255)',
+            $this->platform->getAsciiStringTypeDeclarationSQL([]),
+        );
+        self::assertEquals(
+            'VARCHAR(255)',
+            $this->platform->getAsciiStringTypeDeclarationSQL(['fixed' => false]),
+        );
+    }
+
     public function testSupportsIdentityColumns(): void
     {
         self::assertTrue($this->platform->supportsIdentityColumns());
@@ -777,6 +805,12 @@ public function testInitializesDoctrineTypeMappings(): void
 
         self::assertTrue($this->platform->hasDoctrineTypeMappingFor('uniqueidentifier'));
         self::assertSame(Types::GUID, $this->platform->getDoctrineTypeMapping('uniqueidentifier'));
+
+        self::assertTrue($this->platform->hasDoctrineTypeMappingFor('sysname'));
+        self::assertSame(Types::STRING, $this->platform->getDoctrineTypeMapping('sysname'));
+
+        self::assertTrue($this->platform->hasDoctrineTypeMappingFor('xml'));
+        self::assertSame(Types::TEXT, $this->platform->getDoctrineTypeMapping('xml'));
     }
 
     protected function getExpectedFixedLengthStringTypeDeclarationSQLNoLength(): string