bug #52715 [Cache] fix detecting the database server version (xabbuh)

nicolas-grekas · nicolas-grekas · commit 5f942a9fd3fb · 2023-11-24T14:04:07.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- [Cache] fix detecting the database server version | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | #52685 (comment) | License | MIT Commits ------- 33a65ca fix detecting the database server version
diff --git a/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php b/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php
@@ -421,17 +421,14 @@ private function getServerVersion(): string
             return $this->serverVersion;
         }
 
-        if ($this->conn instanceof ServerVersionProvider) {
-            return $this->conn->getServerVersion();
+        if ($this->conn instanceof ServerVersionProvider || $this->conn instanceof ServerInfoAwareConnection) {
+            return $this->serverVersion = $this->conn->getServerVersion();
         }
 
         // The condition should be removed once support for DBAL <3.3 is dropped
         $conn = method_exists($this->conn, 'getNativeConnection') ? $this->conn->getNativeConnection() : $this->conn->getWrappedConnection();
-        if ($conn instanceof ServerInfoAwareConnection) {
-            return $this->serverVersion = $conn->getServerVersion();
-        }
 
-        return $this->serverVersion = '0';
+        return $this->serverVersion = $conn->getAttribute(\PDO::ATTR_SERVER_VERSION);
     }
 
     private function addTableToSchema(Schema $schema): void

Original file line number	Diff line number	Diff line change
`@@ -421,17 +421,14 @@ private function getServerVersion(): string`
`421`	`421`	`return $this->serverVersion;`
`422`	`422`	`}`
`423`	`423`
`424`		`- if ($this->conn instanceof ServerVersionProvider) {`
`425`		`- return $this->conn->getServerVersion();`
	`424`	`+ if ($this->conn instanceof ServerVersionProvider \|\| $this->conn instanceof ServerInfoAwareConnection) {`
	`425`	`+ return $this->serverVersion = $this->conn->getServerVersion();`
`426`	`426`	`}`
`427`	`427`
`428`	`428`	`// The condition should be removed once support for DBAL <3.3 is dropped`
`429`	`429`	`$conn = method_exists($this->conn, 'getNativeConnection') ? $this->conn->getNativeConnection() : $this->conn->getWrappedConnection();`
`430`		`- if ($conn instanceof ServerInfoAwareConnection) {`
`431`		`- return $this->serverVersion = $conn->getServerVersion();`
`432`		`- }`
`433`	`430`
`434`		`- return $this->serverVersion = '0';`
	`431`	`+ return $this->serverVersion = $conn->getAttribute(\PDO::ATTR_SERVER_VERSION);`
`435`	`432`	`}`
`436`	`433`
`437`	`434`	`private function addTableToSchema(Schema $schema): void`