Update according changes to db package

CHANGELOG.md

@@ -5,7 +5,7 @@
 - Enh #274: Refactor for compatibility with `yiisoft/db` package (@Tigrov)
 - Bug #277: Fix when there is a namespace but the directory does not exist (@Tigrov)
 - Chg #279: Use `ColumnBuilder` class to create table column definitions (@Tigrov)
-- Enh #282, #283: Adapt to Yii DB changes (@Tigrov)
+- Enh #282, #283, #293: Adapt to Yii DB changes (@Tigrov)
 - Bug #286: Explicitly mark nullable parameters (@vjik)
 - Chg #287: Change supported PHP versions to `8.1 - 8.4` (@Tigrov)
 - Enh #287: Minor refactoring (@Tigrov)

src/MigrationBuilder.php

@@ -10,7 +10,6 @@
 use Yiisoft\Db\Constant\IndexType;
 use Yiisoft\Db\Constant\PseudoType;
 use Yiisoft\Db\Constant\ReferentialAction;
-use Yiisoft\Db\Constraint\Constraint;
 use Yiisoft\Db\Exception\InvalidConfigException;
 use Yiisoft\Db\Exception\NotSupportedException;
 use Yiisoft\Db\Query\QueryInterface;
@@ -123,7 +122,6 @@
      * @param array|bool $updateColumns The column data (name => value) to be updated if they already exist.
      * If `true` is passed, the column data will be updated to match the insert column data.
      * If `false` is passed, no update will be performed if the column data already exists.
-     * @param array $params The parameters to be bound to the command.
      *
      * @psalm-param array<string, mixed>|QueryInterface $insertColumns
      *
@@ -135,10 +133,9 @@
         string $table,
         array|QueryInterface $insertColumns,
         array|bool $updateColumns = true,
-        array $params = []
     ): void {
         $time = $this->beginCommand("Upsert into $table");
-        $this->db->createCommand()->upsert($table, $insertColumns, $updateColumns, $params)->execute();
+        $this->db->createCommand()->upsert($table, $insertColumns, $updateColumns)->execute();
         $this->endCommand($time);
     }
 
@@ -689,7 +686,6 @@
 
     private function hasIndex(string $table, string $column): bool
     {
-        /** @var Constraint[] $indexes */
         $indexes = $this->db->getSchema()->getTableIndexes($table);
 
         foreach ($indexes as $index) {

src/Service/Generate/ForeignKeyFactory.php

@@ -37,10 +37,10 @@
             $tablePrimaryKeys = $this->db->getSchema()->getTablePrimaryKey($relatedTable);
 
             if ($tablePrimaryKeys !== null) {
-                $primaryKeys = (array) $tablePrimaryKeys->getColumnNames();
+                $primaryKeys = $tablePrimaryKeys->getColumnNames();
 
                 match (count($primaryKeys)) {
-                    1 => $relatedColumn = (string) $primaryKeys[0],
+                    1 => $relatedColumn = $primaryKeys[0],
                     default => $this->io?->writeln(
                         "<fg=yellow> Related table for field \"$column\" exists, but primary key is composite. Default name \"id\" will be used for related field</>\n"
                     ),

tests/Common/AbstractMigrationBuilderTest.php

@@ -444,7 +444,7 @@ public function testCreateIndex(): void
         $this->assertSame('unique_index', $index->getName());
         $this->assertSame(['id'], $index->getColumnNames());
         $this->assertTrue($index->isUnique());
-        $this->assertFalse($index->isPrimary());
+        $this->assertFalse($index->isPrimaryKey());
         $this->assertInformerOutputContains(
             '    > Create UNIQUE index unique_index on test_table (id) ... Done in ',
         );

tests/Driver/Mysql/MigrationBuilderTest.php

@@ -61,7 +61,7 @@ public function testCreateIndexWithMethod(): void
         $this->assertSame('unique_index', $index->getName());
         $this->assertSame(['id'], $index->getColumnNames());
         $this->assertTrue($index->isUnique());
-        $this->assertFalse($index->isPrimary());
+        $this->assertFalse($index->isPrimaryKey());
         $this->assertInformerOutputContains(
             '    > Create UNIQUE index unique_index on test_table (id) using BTREE ... Done in ',
         );