Merge branch 'master' into php85

Author: vjik

CHANGELOG.md

@@ -179,6 +179,7 @@
 - Chg #1106: Remove parameters from `PdoConnectionInterface::getActivePdo()` method (@vjik)
 - Bug #1109: Fix column definition parsing in cases with brackets and escaped quotes (@vjik)
 - New #1107: Add abstract enumeration column type (@vjik)
+- Bug #1115: Do not reset `$retryHandler` property on `AbstractCommand::reset()` method call (@Tigrov)
 
 ## 1.3.0 March 21, 2024
 

UPGRADE.md

@@ -293,3 +293,4 @@ Each table column has its own class in the `Yiisoft\Db\Schema\Column` namespace
 - Change `QueryPartsInterface::withQueries()` parameter to variadic with type `WithQuery`;
 - In `DQLQueryBuilderInterface::buildWithQueries()` method change first parameter type form `array[]` to `WithQuery[]`;
 - Remove `AbstractCommand::refreshTableSchema()` method;
+- Property `$retryHandler` is not reset on `AbstractCommand::reset()` method call;

src/Command/AbstractCommand.php

@@ -639,7 +639,6 @@ protected function reset(): void
         $this->sql = '';
         $this->params = [];
         $this->refreshTableName = null;
-        $this->retryHandler = null;
     }
 
     /**

tests/Db/Command/CommandTest.php

@@ -582,6 +582,12 @@ public function testSetRetryHandler(): void
         $command->setRetryHandler($handler);
 
         $this->assertSame($handler, Assert::getPropertyValue($command, 'retryHandler'));
+
+        // Test that setting SQL and raw SQL does not change the retry handler.
+        $command->setSql('');
+        $command->setRawSql('');
+
+        $this->assertSame($handler, Assert::getPropertyValue($command, 'retryHandler'));
     }
 
     public function testTruncateTable(): void