|
22 | 22 | use Yiisoft\Db\Schema\TableSchemaInterface; |
23 | 23 |
|
24 | 24 | use function array_change_key_case; |
| 25 | +use function array_column; |
25 | 26 | use function array_map; |
26 | 27 | use function array_reverse; |
27 | 28 | use function implode; |
@@ -264,7 +265,7 @@ protected function loadTableIndexes(string $tableName): array |
264 | 265 | * @psalm-var array[] $index |
265 | 266 | */ |
266 | 267 | foreach ($indexes as $name => $index) { |
267 | | - $columnNames = DbArrayHelper::getColumn($index, 'column_name'); |
| 268 | + $columnNames = array_column($index, 'column_name'); |
268 | 269 |
|
269 | 270 | if ($columnNames[0] === null) { |
270 | 271 | $columnNames[0] = ''; |
@@ -677,27 +678,27 @@ private function loadTableConstraints(string $tableName, string $returnType): mi |
677 | 678 | case 'P': |
678 | 679 | $result[self::PRIMARY_KEY] = (new Constraint()) |
679 | 680 | ->name($name) |
680 | | - ->columnNames(DbArrayHelper::getColumn($constraint, 'column_name')); |
| 681 | + ->columnNames(array_column($constraint, 'column_name')); |
681 | 682 | break; |
682 | 683 | case 'R': |
683 | 684 | $result[self::FOREIGN_KEYS][] = (new ForeignKeyConstraint()) |
684 | 685 | ->name($name) |
685 | | - ->columnNames(DbArrayHelper::getColumn($constraint, 'column_name')) |
| 686 | + ->columnNames(array_column($constraint, 'column_name')) |
686 | 687 | ->foreignSchemaName($constraint[0]['foreign_table_schema']) |
687 | 688 | ->foreignTableName($constraint[0]['foreign_table_name']) |
688 | | - ->foreignColumnNames(DbArrayHelper::getColumn($constraint, 'foreign_column_name')) |
| 689 | + ->foreignColumnNames(array_column($constraint, 'foreign_column_name')) |
689 | 690 | ->onDelete($constraint[0]['on_delete']) |
690 | 691 | ->onUpdate(null); |
691 | 692 | break; |
692 | 693 | case 'U': |
693 | 694 | $result[self::UNIQUES][] = (new Constraint()) |
694 | 695 | ->name($name) |
695 | | - ->columnNames(DbArrayHelper::getColumn($constraint, 'column_name')); |
| 696 | + ->columnNames(array_column($constraint, 'column_name')); |
696 | 697 | break; |
697 | 698 | case 'C': |
698 | 699 | $result[self::CHECKS][] = (new CheckConstraint()) |
699 | 700 | ->name($name) |
700 | | - ->columnNames(DbArrayHelper::getColumn($constraint, 'column_name')) |
| 701 | + ->columnNames(array_column($constraint, 'column_name')) |
701 | 702 | ->expression($constraint[0]['check_expr']); |
702 | 703 | break; |
703 | 704 | } |
|
0 commit comments