Merge pull request #4115 from morozov/remove-requires-query-for-server-version

Remove ServerInfoAwareConnection#requiresQueryForServerVersion() as an implementation detail

UPGRADE.md

 # Upgrade to 3.0
 
+## BC BREAK: `ServerInfoAwareConnection::requiresQueryForServerVersion()` is removed.
+
+The `ServerInfoAwareConnection::requiresQueryForServerVersion()` method has been removed as an implementation detail which is the same for all supported drivers.
+
 ## BC BREAK Changes in driver exceptions
 
 1. The `Doctrine\DBAL\Driver\DriverException::getErrorCode()` method is removed. In order to obtain the driver error code, please use `::getCode()` or `::getSQLState()`.

src/Connection.php

@@ -396,7 +396,7 @@ class Connection implements DriverConnection
         $connection = $this->getWrappedConnection();
 
         // Automatic platform version detection.
-        if ($connection instanceof ServerInfoAwareConnection && ! $connection->requiresQueryForServerVersion()) {
+        if ($connection instanceof ServerInfoAwareConnection) {
             return $connection->getServerVersion();
         }
 

src/Driver/IBMDB2/DB2Connection.php

@@ -73,14 +73,6 @@ class DB2Connection implements ServerInfoAwareConnection
         return $serverInfo->DBMS_VER;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function requiresQueryForServerVersion()
-    {
-        return false;
-    }
-
     public function prepare(string $sql): DriverStatement
     {
         $stmt = @db2_prepare($this->conn, $sql);

src/Driver/Mysqli/MysqliConnection.php

@@ -96,14 +96,6 @@ class MysqliConnection implements PingableConnection, ServerInfoAwareConnection
         return $majorVersion . '.' . $minorVersion . '.' . $patchVersion;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function requiresQueryForServerVersion()
-    {
-        return false;
-    }
-
     public function prepare(string $sql): DriverStatement
     {
         return new Statement($this->conn, $sql);

src/Driver/OCI8/OCI8Connection.php

@@ -97,14 +97,6 @@ class OCI8Connection implements ConnectionInterface, ServerInfoAwareConnection
         return $matches[1];
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function requiresQueryForServerVersion()
-    {
-        return false;
-    }
-
     public function prepare(string $sql): DriverStatement
     {
         return new Statement($this->dbh, $sql, $this->executionMode);

src/Driver/PDOConnection.php

@@ -112,14 +112,6 @@ class PDOConnection implements ServerInfoAwareConnection
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function requiresQueryForServerVersion()
-    {
-        return false;
-    }
-
     /**
      * Creates a wrapped statement
      */

src/Driver/SQLSrv/SQLSrvConnection.php

@@ -66,14 +66,6 @@ class SQLSrvConnection implements ServerInfoAwareConnection
         return $serverInfo['SQLServerVersion'];
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function requiresQueryForServerVersion()
-    {
-        return false;
-    }
-
     public function prepare(string $sql): DriverStatement
     {
         return new Statement($this->conn, $sql, $this->lastInsertId);

src/Driver/ServerInfoAwareConnection.php

@@ -13,11 +13,4 @@ interface ServerInfoAwareConnection extends Connection
      * @return string
      */
     public function getServerVersion();
-
-    /**
-     * Checks whether a query is required to retrieve the database server version.
-     *
-     * @return bool True if a query is required to retrieve the database server version, false otherwise.
-     */
-    public function requiresQueryForServerVersion();
 }

tests/ConnectionTest.php

@@ -661,10 +661,6 @@ class ConnectionTest extends TestCase
             ->method('connect')
             ->will(self::returnValue($driverConnectionMock));
 
-        $driverConnectionMock->expects(self::once())
-            ->method('requiresQueryForServerVersion')
-            ->will(self::returnValue(false));
-
         $driverConnectionMock->expects(self::once())
             ->method('getServerVersion')
             ->will(self::returnValue('6.6.6'));

tests/Driver/IBMDB2/DB2ConnectionTest.php

-<?php
-
-namespace Doctrine\DBAL\Tests\Driver\IBMDB2;
-
-use Doctrine\DBAL\Driver\IBMDB2\DB2Connection;
-use PHPUnit\Framework\MockObject\MockObject;
-use PHPUnit\Framework\TestCase;
-
-use function extension_loaded;
-
-class DB2ConnectionTest extends TestCase
-{
-    /**
-     * The ibm_db2 driver connection mock under test.
-     *
-     * @var DB2Connection|MockObject
-     */
-    private $connectionMock;
-
-    protected function setUp(): void
-    {
-        if (! extension_loaded('ibm_db2')) {
-            $this->markTestSkipped('ibm_db2 is not installed.');
-        }
-
-        parent::setUp();
-
-        $this->connectionMock = $this->getMockBuilder(DB2Connection::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-    }
-
-    public function testDoesNotRequireQueryForServerVersion(): void
-    {
-        self::assertFalse($this->connectionMock->requiresQueryForServerVersion());
-    }
-}

tests/Driver/Mysqli/MysqliConnectionTest.php

@@ -4,22 +4,12 @@ namespace Doctrine\DBAL\Tests\Driver\Mysqli;
 
 use Doctrine\DBAL\Driver\Mysqli\Driver;
 use Doctrine\DBAL\Driver\Mysqli\HostRequired;
-use Doctrine\DBAL\Driver\Mysqli\MysqliConnection;
-use Doctrine\DBAL\Platforms\MySqlPlatform;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
-use PHPUnit\Framework\MockObject\MockObject;
 
 use function extension_loaded;
 
 class MysqliConnectionTest extends FunctionalTestCase
 {
-    /**
-     * The mysqli driver connection mock under test.
-     *
-     * @var MysqliConnection|MockObject
-     */
-    private $connectionMock;
-
     protected function setUp(): void
     {
         if (! extension_loaded('mysqli')) {
@@ -27,19 +17,6 @@ class MysqliConnectionTest extends FunctionalTestCase
         }
 
         parent::setUp();
-
-        if (! $this->connection->getDatabasePlatform() instanceof MySqlPlatform) {
-            $this->markTestSkipped('MySQL only test.');
-        }
-
-        $this->connectionMock = $this->getMockBuilder(MysqliConnection::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-    }
-
-    public function testDoesNotRequireQueryForServerVersion(): void
-    {
-        self::assertFalse($this->connectionMock->requiresQueryForServerVersion());
     }
 
     public function testHostnameIsRequiredForPersistentConnection(): void

tests/Driver/OCI8/OCI8ConnectionTest.php

-<?php
-
-namespace Doctrine\DBAL\Tests\Driver\OCI8;
-
-use Doctrine\DBAL\Driver\OCI8\OCI8Connection;
-use PHPUnit\Framework\MockObject\MockObject;
-use PHPUnit\Framework\TestCase;
-
-use function extension_loaded;
-
-class OCI8ConnectionTest extends TestCase
-{
-    /**
-     * The oci8 driver connection mock under test.
-     *
-     * @var OCI8Connection|MockObject
-     */
-    private $connectionMock;
-
-    protected function setUp(): void
-    {
-        if (! extension_loaded('oci8')) {
-            $this->markTestSkipped('oci8 is not installed.');
-        }
-
-        parent::setUp();
-
-        $this->connectionMock = $this->getMockBuilder(OCI8Connection::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-    }
-
-    public function testDoesNotRequireQueryForServerVersion(): void
-    {
-        self::assertFalse($this->connectionMock->requiresQueryForServerVersion());
-    }
-}

tests/Driver/SQLSrv/SQLSrvConnectionTest.php

-<?php
-
-namespace Doctrine\DBAL\Tests\Driver\SQLSrv;
-
-use Doctrine\DBAL\Driver\SQLSrv\SQLSrvConnection;
-use PHPUnit\Framework\MockObject\MockObject;
-use PHPUnit\Framework\TestCase;
-
-use function extension_loaded;
-
-class SQLSrvConnectionTest extends TestCase
-{
-    /**
-     * The sqlsrv driver connection mock under test.
-     *
-     * @var SQLSrvConnection|MockObject
-     */
-    private $connectionMock;
-
-    protected function setUp(): void
-    {
-        if (! extension_loaded('sqlsrv')) {
-            $this->markTestSkipped('sqlsrv is not installed.');
-        }
-
-        parent::setUp();
-
-        $this->connectionMock = $this->getMockBuilder(SQLSrvConnection::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-    }
-
-    public function testDoesNotRequireQueryForServerVersion(): void
-    {
-        self::assertFalse($this->connectionMock->requiresQueryForServerVersion());
-    }
-}

tests/Functional/Driver/PDO/ConnectionTest.php

@@ -45,11 +45,6 @@ class ConnectionTest extends FunctionalTestCase
         parent::tearDown();
     }
 
-    public function testDoesNotRequireQueryForServerVersion(): void
-    {
-        self::assertFalse($this->driverConnection->requiresQueryForServerVersion());
-    }
-
     public function testThrowsWrappedExceptionOnConstruct(): void
     {
         $this->expectException(Exception::class);