Merge branch '3.10.x' into 4.3.x

* 3.10.x:
  CI: Update SQL Server to version 2022 (#7069)
  fix(MariaDb): add support of new reserved word `VECTOR` (11.7+) (#7061)
  Fix binding null as a boolean parameter on pgsql (#7059)

Author: derrabus

.github/workflows/phpunit-sqlserver.yml

@@ -19,7 +19,7 @@ jobs:
 
     services:
       sqlserver:
-        image: mcr.microsoft.com/mssql/server:2019-latest
+        image: mcr.microsoft.com/mssql/server:2022-latest
         ports:
           - '1433:1433'
         env:

src/Driver/AbstractMySQLDriver.php

@@ -12,6 +12,7 @@
 use Doctrine\DBAL\Platforms\MariaDB1010Platform;
 use Doctrine\DBAL\Platforms\MariaDB1052Platform;
 use Doctrine\DBAL\Platforms\MariaDB1060Platform;
+use Doctrine\DBAL\Platforms\MariaDB110700Platform;
 use Doctrine\DBAL\Platforms\MariaDBPlatform;
 use Doctrine\DBAL\Platforms\MySQL80Platform;
 use Doctrine\DBAL\Platforms\MySQL84Platform;
@@ -38,6 +39,10 @@ public function getDatabasePlatform(ServerVersionProvider $versionProvider): Abs
         $version = $versionProvider->getServerVersion();
         if (stripos($version, 'mariadb') !== false) {
             $mariaDbVersion = $this->getMariaDbMysqlVersionNumber($version);
+            if (version_compare($mariaDbVersion, '11.7.0', '>=')) {
+                return new MariaDB110700Platform();
+            }
+
             if (version_compare($mariaDbVersion, '10.10.0', '>=')) {
                 return new MariaDB1010Platform();
             }

src/Driver/PgSQL/Statement.php

@@ -57,6 +57,10 @@ public function bindValue(int|string $param, mixed $value, ParameterType $type =
             throw UnknownParameter::new((string) $param);
         }
 
+        if ($value === null) {
+            $type = ParameterType::NULL;
+        }
+
         if ($type === ParameterType::BOOLEAN) {
             $this->parameters[$this->parameterMap[$param]]     = (bool) $value === false ? 'f' : 't';
             $this->parameterTypes[$this->parameterMap[$param]] = ParameterType::STRING;

src/Platforms/Keywords/MariaDB117Keywords.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Platforms\Keywords;
+
+use function array_merge;
+
+/** @deprecated */
+class MariaDB117Keywords extends MariaDBKeywords
+{
+    /**
+     * {@inheritDoc}
+     *
+     * @link https://mariadb.com/docs/server/reference/sql-structure/sql-language-structure/reserved-words
+     */
+    protected function getKeywords(): array
+    {
+        $keywords = parent::getKeywords();
+
+        // New Keywords and Reserved Words
+        $keywords = array_merge($keywords, ['VECTOR']);
+
+        return $keywords;
+    }
+}

src/Platforms/MariaDB110700Platform.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Platforms;
+
+use Doctrine\DBAL\Platforms\Keywords\KeywordList;
+use Doctrine\DBAL\Platforms\Keywords\MariaDB117Keywords;
+use Doctrine\Deprecations\Deprecation;
+
+/**
+ * Provides the behavior, features and SQL dialect of the MariaDB 11.7 database platform.
+ */
+class MariaDB110700Platform extends MariaDB1010Platform
+{
+    /** @deprecated */
+    protected function createReservedKeywordsList(): KeywordList
+    {
+        Deprecation::triggerIfCalledFromOutside(
+            'doctrine/dbal',
+            'https://github.com/doctrine/dbal/pull/6607',
+            '%s is deprecated.',
+            __METHOD__,
+        );
+
+        return new MariaDB117Keywords();
+    }
+}

tests/Functional/BooleanBindingTest.php

@@ -26,6 +26,7 @@ protected function setUp(): void
                 Column::editor()
                     ->setUnquotedName('val')
                     ->setTypeName(Types::BOOLEAN)
+                    ->setNotNull(false)
                     ->create(),
             )
             ->create();
@@ -39,7 +40,7 @@ protected function tearDown(): void
     }
 
     #[DataProvider('booleanProvider')]
-    public function testBooleanInsert(bool $input): void
+    public function testBooleanParameterInsert(?bool $input): void
     {
         $queryBuilder = $this->connection->createQueryBuilder();
 
@@ -48,11 +49,37 @@ public function testBooleanInsert(bool $input): void
         ])->executeStatement();
 
         self::assertSame(1, $result);
+
+        self::assertSame($input, $this->connection->convertToPHPValue(
+            $this->connection->fetchOne('SELECT val FROM boolean_test_table'),
+            Types::BOOLEAN,
+        ));
+    }
+
+    #[DataProvider('booleanProvider')]
+    public function testBooleanTypeInsert(?bool $input): void
+    {
+        $queryBuilder = $this->connection->createQueryBuilder();
+
+        $result = $queryBuilder->insert('boolean_test_table')->values([
+            'val' => $queryBuilder->createNamedParameter($input, Types::BOOLEAN),
+        ])->executeStatement();
+
+        self::assertSame(1, $result);
+
+        self::assertSame($input, $this->connection->convertToPHPValue(
+            $this->connection->fetchOne('SELECT val FROM boolean_test_table'),
+            Types::BOOLEAN,
+        ));
     }
 
-    /** @return bool[][] */
+    /** @return array<string, array{bool|null}> */
     public static function booleanProvider(): array
     {
-        return [[true], [false]];
+        return [
+            'true' => [true],
+            'false' => [false],
+            'null' => [null],
+        ];
     }
 }

tests/Platforms/MariaDB110700PlatformTest.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Tests\Platforms;
+
+use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\DBAL\Platforms\MariaDB110700Platform;
+
+class MariaDB110700PlatformTest extends MariaDB1052PlatformTest
+{
+    public function createPlatform(): AbstractPlatform
+    {
+        return new MariaDB110700Platform();
+    }
+
+    public function testMariaDb117KeywordList(): void
+    {
+        $keywordList = $this->platform->getReservedKeywordsList();
+
+        self::assertTrue($keywordList->isKeyword('vector'));
+        self::assertTrue($keywordList->isKeyword('distinctrow'));
+    }
+}