Skip to content

Commit 5571e08

Browse files
authored
Replace DbArrayHelper::getColumn() with array_column() (#300)
1 parent c76d52f commit 5571e08

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
- Enh #298: Refactor `DMLQueryBuilder::prepareInsertValues()` method (@Tigrov)
3030
- Enh #299: Add `ColumnDefinitionParser` class (@Tigrov)
3131
- Enh #299: Convert database types to lower case (@Tigrov)
32+
- Enh #300: Replace `DbArrayHelper::getColumn()` with `array_column()` (@Tigrov)
3233

3334
## 1.3.0 March 21, 2024
3435

src/Schema.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
use Yiisoft\Db\Schema\TableSchemaInterface;
2323

2424
use function array_change_key_case;
25+
use function array_column;
2526
use function array_map;
2627
use function array_reverse;
2728
use function implode;
@@ -264,7 +265,7 @@ protected function loadTableIndexes(string $tableName): array
264265
* @psalm-var array[] $index
265266
*/
266267
foreach ($indexes as $name => $index) {
267-
$columnNames = DbArrayHelper::getColumn($index, 'column_name');
268+
$columnNames = array_column($index, 'column_name');
268269

269270
if ($columnNames[0] === null) {
270271
$columnNames[0] = '';
@@ -677,27 +678,27 @@ private function loadTableConstraints(string $tableName, string $returnType): mi
677678
case 'P':
678679
$result[self::PRIMARY_KEY] = (new Constraint())
679680
->name($name)
680-
->columnNames(DbArrayHelper::getColumn($constraint, 'column_name'));
681+
->columnNames(array_column($constraint, 'column_name'));
681682
break;
682683
case 'R':
683684
$result[self::FOREIGN_KEYS][] = (new ForeignKeyConstraint())
684685
->name($name)
685-
->columnNames(DbArrayHelper::getColumn($constraint, 'column_name'))
686+
->columnNames(array_column($constraint, 'column_name'))
686687
->foreignSchemaName($constraint[0]['foreign_table_schema'])
687688
->foreignTableName($constraint[0]['foreign_table_name'])
688-
->foreignColumnNames(DbArrayHelper::getColumn($constraint, 'foreign_column_name'))
689+
->foreignColumnNames(array_column($constraint, 'foreign_column_name'))
689690
->onDelete($constraint[0]['on_delete'])
690691
->onUpdate(null);
691692
break;
692693
case 'U':
693694
$result[self::UNIQUES][] = (new Constraint())
694695
->name($name)
695-
->columnNames(DbArrayHelper::getColumn($constraint, 'column_name'));
696+
->columnNames(array_column($constraint, 'column_name'));
696697
break;
697698
case 'C':
698699
$result[self::CHECKS][] = (new CheckConstraint())
699700
->name($name)
700-
->columnNames(DbArrayHelper::getColumn($constraint, 'column_name'))
701+
->columnNames(array_column($constraint, 'column_name'))
701702
->expression($constraint[0]['check_expr']);
702703
break;
703704
}

0 commit comments

Comments
 (0)