Better naming helpers. (#244)

terabytesoftw · web-flow · commit 2b2b59a81ce1 · 2023-04-05T06:11:15.000-04:00
diff --git a/src/Schema.php b/src/Schema.php
@@ -15,7 +15,7 @@
 use Yiisoft\Db\Exception\InvalidConfigException;
 use Yiisoft\Db\Exception\NotSupportedException;
 use Yiisoft\Db\Expression\Expression;
-use Yiisoft\Db\Helper\ArrayHelper;
+use Yiisoft\Db\Helper\DbArrayHelper;
 use Yiisoft\Db\Schema\Builder\ColumnInterface;
 use Yiisoft\Db\Schema\ColumnSchemaInterface;
 use Yiisoft\Db\Schema\TableSchemaInterface;
@@ -206,15 +206,15 @@ protected function loadTableForeignKeys(string $tableName): array
         /** @psalm-var NormalizePragmaForeignKeyList $foreignKeysList */
         $foreignKeysList = $this->normalizeRowKeyCase($foreignKeysList, true);
         /** @psalm-var NormalizePragmaForeignKeyList $foreignKeysList */
-        $foreignKeysList = ArrayHelper::index($foreignKeysList, null, ['table']);
-        ArrayHelper::multisort($foreignKeysList, 'seq');
+        $foreignKeysList = DbArrayHelper::index($foreignKeysList, null, ['table']);
+        DbArrayHelper::multisort($foreignKeysList, 'seq');
 
         /** @psalm-var NormalizePragmaForeignKeyList $foreignKeysList */
         foreach ($foreignKeysList as $table => $foreignKey) {
             $fk = (new ForeignKeyConstraint())
-                ->columnNames(ArrayHelper::getColumn($foreignKey, 'from'))
+                ->columnNames(DbArrayHelper::getColumn($foreignKey, 'from'))
                 ->foreignTableName($table)
-                ->foreignColumnNames(ArrayHelper::getColumn($foreignKey, 'to'))
+                ->foreignColumnNames(DbArrayHelper::getColumn($foreignKey, 'to'))
                 ->onDelete($foreignKey[0]['on_delete'] ?? null)
                 ->onUpdate($foreignKey[0]['on_update'] ?? null);
 
@@ -525,7 +525,7 @@ private function loadTableColumnsInfo(string $tableName): array
         /** @psalm-var PragmaTableInfo $tableColumns */
         $tableColumns = $this->normalizeRowKeyCase($tableColumns, true);
 
-        return ArrayHelper::index($tableColumns, 'cid');
+        return DbArrayHelper::index($tableColumns, 'cid');
     }
 
     /**
@@ -557,20 +557,20 @@ private function loadTableConstraints(string $tableName, string $returnType): Co
 
             if ($index['origin'] === 'pk') {
                 $result[self::PRIMARY_KEY] = (new Constraint())
-                    ->columnNames(ArrayHelper::getColumn($columns, 'name'));
+                    ->columnNames(DbArrayHelper::getColumn($columns, 'name'));
             }
 
             if ($index['origin'] === 'u') {
                 $result[self::UNIQUES][] = (new Constraint())
                     ->name($index['name'])
-                    ->columnNames(ArrayHelper::getColumn($columns, 'name'));
+                    ->columnNames(DbArrayHelper::getColumn($columns, 'name'));
             }
 
             $result[self::INDEXES][] = (new IndexConstraint())
                 ->primary($index['origin'] === 'pk')
                 ->unique((bool) $index['unique'])
                 ->name($index['name'])
-                ->columnNames(ArrayHelper::getColumn($columns, 'name'));
+                ->columnNames(DbArrayHelper::getColumn($columns, 'name'));
         }
 
         if (!isset($result[self::PRIMARY_KEY])) {
@@ -636,7 +636,7 @@ private function getPragmaIndexInfo(string $name): array
             ->queryAll();
         /** @psalm-var Column $column */
         $column = $this->normalizeRowKeyCase($column, true);
-        ArrayHelper::multisort($column, 'seqno');
+        DbArrayHelper::multisort($column, 'seqno');
 
         return $column;
     }
