bug #47157 [Messenger] Fix Doctrine transport on MySQL (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit e93f01601eac · 2022-08-02T17:40:03.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [Messenger] Fix Doctrine transport on MySQL | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #46351 | License | MIT | Doc PR | - Commits ------- 9da305a [Messenger] Fix Doctrine transport on MySQL
diff --git a/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php b/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php
@@ -162,7 +162,7 @@ public function get(): ?array
     {
         if ($this->driverConnection->getDatabasePlatform() instanceof MySQLPlatform) {
             try {
-                $this->driverConnection->delete($this->configuration['table_name'], ['delivered_at' => '9999-12-31']);
+                $this->driverConnection->delete($this->configuration['table_name'], ['delivered_at' => '9999-12-31 23:59:59']);
             } catch (DriverException $e) {
                 // Ignore the exception
             }
@@ -252,7 +252,7 @@ public function ack(string $id): bool
     {
         try {
             if ($this->driverConnection->getDatabasePlatform() instanceof MySQLPlatform) {
-                return $this->driverConnection->update($this->configuration['table_name'], ['delivered_at' => '9999-12-31'], ['id' => $id]) > 0;
+                return $this->driverConnection->update($this->configuration['table_name'], ['delivered_at' => '9999-12-31 23:59:59'], ['id' => $id]) > 0;
             }
 
             return $this->driverConnection->delete($this->configuration['table_name'], ['id' => $id]) > 0;
@@ -265,7 +265,7 @@ public function reject(string $id): bool
     {
         try {
             if ($this->driverConnection->getDatabasePlatform() instanceof MySQLPlatform) {
-                return $this->driverConnection->update($this->configuration['table_name'], ['delivered_at' => '9999-12-31'], ['id' => $id]) > 0;
+                return $this->driverConnection->update($this->configuration['table_name'], ['delivered_at' => '9999-12-31 23:59:59'], ['id' => $id]) > 0;
             }
 
             return $this->driverConnection->delete($this->configuration['table_name'], ['id' => $id]) > 0;

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ public function get(): ?array`
`162`	`162`	`{`
`163`	`163`	`if ($this->driverConnection->getDatabasePlatform() instanceof MySQLPlatform) {`
`164`	`164`	`try {`
`165`		`- $this->driverConnection->delete($this->configuration['table_name'], ['delivered_at' => '9999-12-31']);`
	`165`	`+ $this->driverConnection->delete($this->configuration['table_name'], ['delivered_at' => '9999-12-31 23:59:59']);`
`166`	`166`	`} catch (DriverException $e) {`
`167`	`167`	`// Ignore the exception`
`168`	`168`	`}`
`@@ -252,7 +252,7 @@ public function ack(string $id): bool`
`252`	`252`	`{`
`253`	`253`	`try {`
`254`	`254`	`if ($this->driverConnection->getDatabasePlatform() instanceof MySQLPlatform) {`
`255`		`- return $this->driverConnection->update($this->configuration['table_name'], ['delivered_at' => '9999-12-31'], ['id' => $id]) > 0;`
	`255`	`+ return $this->driverConnection->update($this->configuration['table_name'], ['delivered_at' => '9999-12-31 23:59:59'], ['id' => $id]) > 0;`
`256`	`256`	`}`
`257`	`257`
`258`	`258`	`return $this->driverConnection->delete($this->configuration['table_name'], ['id' => $id]) > 0;`
`@@ -265,7 +265,7 @@ public function reject(string $id): bool`
`265`	`265`	`{`
`266`	`266`	`try {`
`267`	`267`	`if ($this->driverConnection->getDatabasePlatform() instanceof MySQLPlatform) {`
`268`		`- return $this->driverConnection->update($this->configuration['table_name'], ['delivered_at' => '9999-12-31'], ['id' => $id]) > 0;`
	`268`	`+ return $this->driverConnection->update($this->configuration['table_name'], ['delivered_at' => '9999-12-31 23:59:59'], ['id' => $id]) > 0;`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`return $this->driverConnection->delete($this->configuration['table_name'], ['id' => $id]) > 0;`