Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions src/Schema/AbstractSchemaManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,6 @@ public function listTableColumns(string $table): array
$database = $this->getDatabase(__METHOD__);

return $this->_getPortableTableColumnList(
$table,
$database,
$this->fetchTableColumns($database, $this->normalizeName($table)),
);
}
Expand All @@ -144,7 +142,6 @@ public function listTableIndexes(string $table): array

return $this->_getPortableTableIndexesList(
$this->fetchIndexColumns($database, $table),
$table,
);
}

Expand Down Expand Up @@ -229,9 +226,9 @@ public function listTables(): array

$editor = Table::editor()
->setName($tableName)
->setColumns($this->_getPortableTableColumnList($tableName, $database, $tableColumns))
->setColumns($this->_getPortableTableColumnList($tableColumns))
->setIndexes(
$this->_getPortableTableIndexesList($indexColumnsByTable[$tableName] ?? [], $tableName),
$this->_getPortableTableIndexesList($indexColumnsByTable[$tableName] ?? []),
);

if (isset($foreignKeyColumnsByTable[$tableName])) {
Expand Down Expand Up @@ -765,7 +762,7 @@ protected function _getPortableSequenceDefinition(array $sequence): Sequence
*
* @return array<string, Column>
*/
protected function _getPortableTableColumnList(string $table, string $database, array $rows): array
protected function _getPortableTableColumnList(array $rows): array
{
$list = [];
foreach ($rows as $row) {
Expand All @@ -791,7 +788,7 @@ abstract protected function _getPortableTableColumnDefinition(array $tableColumn
*
* @return array<string, Index>
*/
protected function _getPortableTableIndexesList(array $rows, string $tableName): array
protected function _getPortableTableIndexesList(array $rows): array
{
$result = [];
foreach ($rows as $row) {
Expand Down
4 changes: 2 additions & 2 deletions src/Schema/DB2SchemaManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,14 @@ protected function _getPortableTableDefinition(array $table): string
/**
* {@inheritDoc}
*/
protected function _getPortableTableIndexesList(array $rows, string $tableName): array
protected function _getPortableTableIndexesList(array $rows): array
{
foreach ($rows as &$row) {
$row = array_change_key_case($row, CASE_LOWER);
$row['primary'] = (bool) $row['primary'];
}

return parent::_getPortableTableIndexesList($rows, $tableName);
return parent::_getPortableTableIndexesList($rows);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/Schema/MySQLSchemaManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ protected function _getPortableViewDefinition(array $view): View
/**
* {@inheritDoc}
*/
protected function _getPortableTableIndexesList(array $rows, string $tableName): array
protected function _getPortableTableIndexesList(array $rows): array
{
foreach ($rows as $i => $row) {
$row = array_change_key_case($row, CASE_LOWER);
Expand All @@ -103,7 +103,7 @@ protected function _getPortableTableIndexesList(array $rows, string $tableName):
$rows[$i] = $row;
}

return parent::_getPortableTableIndexesList($rows, $tableName);
return parent::_getPortableTableIndexesList($rows);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/Schema/OracleSchemaManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ protected function _getPortableTableDefinition(array $table): string
/**
* {@inheritDoc}
*/
protected function _getPortableTableIndexesList(array $rows, string $tableName): array
protected function _getPortableTableIndexesList(array $rows): array
{
$indexBuffer = [];
foreach ($rows as $row) {
Expand All @@ -78,7 +78,7 @@ protected function _getPortableTableIndexesList(array $rows, string $tableName):
$indexBuffer[] = $buffer;
}

return parent::_getPortableTableIndexesList($indexBuffer, $tableName);
return parent::_getPortableTableIndexesList($indexBuffer);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/Schema/PostgreSQLSchemaManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ protected function _getPortableTableDefinition(array $table): string
/**
* {@inheritDoc}
*/
protected function _getPortableTableIndexesList(array $rows, string $tableName): array
protected function _getPortableTableIndexesList(array $rows): array
{
$buffer = [];
foreach ($rows as $row) {
Expand Down Expand Up @@ -207,7 +207,7 @@ protected function _getPortableTableIndexesList(array $rows, string $tableName):
}
}

return parent::_getPortableTableIndexesList($buffer, $tableName);
return parent::_getPortableTableIndexesList($buffer);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/Schema/SQLServerSchemaManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -208,15 +208,15 @@ protected function _getPortableTableForeignKeysList(array $rows): array
/**
* {@inheritDoc}
*/
protected function _getPortableTableIndexesList(array $rows, string $tableName): array
protected function _getPortableTableIndexesList(array $rows): array
{
foreach ($rows as &$row) {
$row['non_unique'] = (bool) $row['non_unique'];
$row['primary'] = (bool) $row['primary'];
$row['flags'] = $row['flags'] ? [$row['flags']] : null;
}

return parent::_getPortableTableIndexesList($rows, $tableName);
return parent::_getPortableTableIndexesList($rows);
}

/**
Expand Down