Merge pull request #5981 from jdelaune/3.6.x

For PrimaryReadReplicaConnection passthrough primary server version
doctrine · Apr 14, 2023 · b4bd1cf · b4bd1cf
2 parents f687df2 + a209b17
commit b4bd1cf
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 0 deletions.
diff --git a/src/Connection.php b/src/Connection.php
@@ -440,6 +440,10 @@ private function getDatabasePlatformVersion()
             return $this->params['serverVersion'];
         }
 
+        if (isset($this->params['primary']) && isset($this->params['primary']['serverVersion'])) {
+            return $this->params['primary']['serverVersion'];
+        }
+
         // If not connected, we need to connect now to determine the platform version.
         if ($this->_conn === null) {
             try {

diff --git a/src/DriverManager.php b/src/DriverManager.php
@@ -36,6 +36,7 @@
  *     persistent?: bool,
  *     platform?: Platforms\AbstractPlatform,
  *     port?: int,
+ *     serverVersion?: string,
  *     url?: string,
  *     user?: string,
  *     unix_socket?: string,

diff --git a/tests/ConnectionTest.php b/tests/ConnectionTest.php
@@ -739,6 +739,50 @@ public function testPlatformDetectionIsTriggerOnlyOnceOnRetrievingPlatform(): vo
         self::assertSame($platformMock, $connection->getDatabasePlatform());
     }
 
+    public function testPlatformDetectionFetchedFromParameters(): void
+    {
+        $driverMock = $this->createMock(VersionAwarePlatformDriver::class);
+
+        $driverConnectionMock = $this->createMock(ServerInfoAwareConnection::class);
+
+        $platformMock = $this->getMockForAbstractClass(AbstractPlatform::class);
+
+        $connection = new Connection(['serverVersion' => '8.0'], $driverMock);
+
+        $driverMock->expects(self::never())
+            ->method('connect')
+            ->willReturn($driverConnectionMock);
+
+        $driverMock->expects(self::once())
+            ->method('createDatabasePlatformForVersion')
+            ->with('8.0')
+            ->willReturn($platformMock);
+
+        self::assertSame($platformMock, $connection->getDatabasePlatform());
+    }
+
+    public function testPlatformDetectionFetchedFromPrimaryReplicaParameters(): void
+    {
+        $driverMock = $this->createMock(VersionAwarePlatformDriver::class);
+
+        $driverConnectionMock = $this->createMock(ServerInfoAwareConnection::class);
+
+        $platformMock = $this->getMockForAbstractClass(AbstractPlatform::class);
+
+        $connection = new Connection(['primary' => ['serverVersion' => '8.0']], $driverMock);
+
+        $driverMock->expects(self::never())
+            ->method('connect')
+            ->willReturn($driverConnectionMock);
+
+        $driverMock->expects(self::once())
+            ->method('createDatabasePlatformForVersion')
+            ->with('8.0')
+            ->willReturn($platformMock);
+
+        self::assertSame($platformMock, $connection->getDatabasePlatform());
+    }
+
     public function testConnectionParamsArePassedToTheQueryCacheProfileInExecuteCacheQuery(): void
     {
         $cacheItemMock = $this->createMock(CacheItemInterface::class);