makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6471 from iMattPro/ticket/17105

Browse source 
[ticket/17105] Fix order of arguments for schema changes on indexes
This commit is contained in:
Marc Alexander 2023-03-19 21:01:56 +01:00 • committed by GitHub
commit 2a943b458b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
phpBB/phpbb/db/tools/doctrine.php
View file

@ -267,7 +267,7 @@ class doctrine implements tools_interface
{ {
foreach ($column_indexes as $index) foreach ($column_indexes as $index)
{ {
$this->schema_create_index($index->getColumns(), $schema, $table_name, $index->getName()); $this->schema_create_index($schema, $table_name, $index->getName(), $index->getColumns());
} }
} }
} }
@ -319,7 +319,7 @@ class doctrine implements tools_interface
return $this->alter_schema( return $this->alter_schema(
function (Schema $schema) use ($table_name, $index_name, $column): void function (Schema $schema) use ($table_name, $index_name, $column): void
{ {
$this->schema_create_index($column, $schema, $table_name, $index_name); $this->schema_create_index($schema, $table_name, $index_name, $column);
} }
); );
} }
@ -345,7 +345,7 @@ class doctrine implements tools_interface
return $this->alter_schema( return $this->alter_schema(
function (Schema $schema) use ($table_name, $index_name, $column): void function (Schema $schema) use ($table_name, $index_name, $column): void
{ {
$this->schema_create_unique_index($column, $schema, $table_name, $index_name); $this->schema_create_unique_index($schema, $table_name, $index_name, $column);
} }
); );
} }
@ -797,15 +797,15 @@ class doctrine implements tools_interface
} }
/** /**
* @param $column
* @param Schema $schema * @param Schema $schema
* @param string $table_name * @param string $table_name
* @param string $index_name * @param string $index_name
* @param string|array $column
* @param bool $safe_check * @param bool $safe_check
* *
* @throws SchemaException * @throws SchemaException
*/ */
protected function schema_create_index($column, Schema $schema, string $table_name, string $index_name, bool $safe_check = false): void protected function schema_create_index(Schema $schema, string $table_name, string $index_name, $column, bool $safe_check = false): void
{ {
$columns = (is_array($column)) ? $column : [$column]; $columns = (is_array($column)) ? $column : [$column];
$table = $schema->getTable($table_name); $table = $schema->getTable($table_name);
@ -819,15 +819,15 @@ class doctrine implements tools_interface
} }
/** /**
* @param $column
* @param Schema $schema * @param Schema $schema
* @param string $table_name * @param string $table_name
* @param string $index_name * @param string $index_name
* @param string|array $column
* @param bool $safe_check * @param bool $safe_check
* *
* @throws SchemaException * @throws SchemaException
*/ */
protected function schema_create_unique_index($column, Schema $schema, string $table_name, string $index_name, bool $safe_check = false): void protected function schema_create_unique_index(Schema $schema, string $table_name, string $index_name, $column, bool $safe_check = false): void
{ {
$columns = (is_array($column)) ? $column : [$column]; $columns = (is_array($column)) ? $column : [$column];
$table = $schema->getTable($table_name); $table = $schema->getTable($table_name);