Skip to content

Commit

Permalink
Replace DbArrayHelper::getColumn() with array_column() (#300)
Browse files Browse the repository at this point in the history
  • Loading branch information
Tigrov authored Jan 31, 2025
1 parent c76d52f commit 5571e08
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
- Enh #298: Refactor `DMLQueryBuilder::prepareInsertValues()` method (@Tigrov)
- Enh #299: Add `ColumnDefinitionParser` class (@Tigrov)
- Enh #299: Convert database types to lower case (@Tigrov)
- Enh #300: Replace `DbArrayHelper::getColumn()` with `array_column()` (@Tigrov)

## 1.3.0 March 21, 2024

Expand Down
13 changes: 7 additions & 6 deletions src/Schema.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
use Yiisoft\Db\Schema\TableSchemaInterface;

use function array_change_key_case;
use function array_column;
use function array_map;
use function array_reverse;
use function implode;
Expand Down Expand Up @@ -264,7 +265,7 @@ protected function loadTableIndexes(string $tableName): array
* @psalm-var array[] $index
*/
foreach ($indexes as $name => $index) {
$columnNames = DbArrayHelper::getColumn($index, 'column_name');
$columnNames = array_column($index, 'column_name');

if ($columnNames[0] === null) {
$columnNames[0] = '';
Expand Down Expand Up @@ -677,27 +678,27 @@ private function loadTableConstraints(string $tableName, string $returnType): mi
case 'P':
$result[self::PRIMARY_KEY] = (new Constraint())
->name($name)
->columnNames(DbArrayHelper::getColumn($constraint, 'column_name'));
->columnNames(array_column($constraint, 'column_name'));
break;
case 'R':
$result[self::FOREIGN_KEYS][] = (new ForeignKeyConstraint())
->name($name)
->columnNames(DbArrayHelper::getColumn($constraint, 'column_name'))
->columnNames(array_column($constraint, 'column_name'))
->foreignSchemaName($constraint[0]['foreign_table_schema'])
->foreignTableName($constraint[0]['foreign_table_name'])
->foreignColumnNames(DbArrayHelper::getColumn($constraint, 'foreign_column_name'))
->foreignColumnNames(array_column($constraint, 'foreign_column_name'))
->onDelete($constraint[0]['on_delete'])
->onUpdate(null);
break;
case 'U':
$result[self::UNIQUES][] = (new Constraint())
->name($name)
->columnNames(DbArrayHelper::getColumn($constraint, 'column_name'));
->columnNames(array_column($constraint, 'column_name'));
break;
case 'C':
$result[self::CHECKS][] = (new CheckConstraint())
->name($name)
->columnNames(DbArrayHelper::getColumn($constraint, 'column_name'))
->columnNames(array_column($constraint, 'column_name'))
->expression($constraint[0]['check_expr']);
break;
}
Expand Down

0 comments on commit 5571e08

Please sign in to comment.