mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-14 12:52:08 +02:00
Code Issues Releases Wiki Activity

Merge pull request #4864 from lavigor/ticket/15259

Browse Source 
[ticket/15259] Fatal error on SQLite/Oracle database update
This commit is contained in:
Marc Alexander 2017-07-16 17:33:52 +02:00
commit d490190a99
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
2 changed files with 51 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
phpBB/phpbb/db/tools/tools.php
View File

@ -941,29 +941,19 @@ class tools implements tools_interface
continue;
}
// These DBMS prefix index name with the table name
switch ($this->sql_layer)
{
// These DBMS prefix index name with the table name
case 'oracle':
case 'sqlite3':
$index_name = $this->check_index_name_length($table_name, $table_name . '_' . $index_name, false);
$table_prefix = substr(CONFIG_TABLE, 0, -6); // strlen(config)
if (strpos($index_name , $table_name) === false)
{
if (strpos($index_name, $table_prefix) !== false)
{
$row[$col] = substr($row[$col], strlen($table_prefix) + 1);
}
else
{
$row[$col] = substr($row[$col], strlen($table_name) + 1);
}
}
$new_index_name = $this->check_index_name_length($table_name, $table_name . '_' . $index_name, false);
break;
default:
$new_index_name = $this->check_index_name_length($table_name, $index_name, false);
break;
}
if (strtolower($row[$col]) == strtolower($index_name))
if (strtolower($row[$col]) == strtolower($new_index_name))
{
$this->db->sql_freeresult($result);
return true;
@ -1577,15 +1567,17 @@ class tools implements tools_interface
$table_prefix = substr(CONFIG_TABLE, 0, -6); // strlen(config)
if (strpos($index_name, $table_prefix) === 0)
{
$index_name = substr($index_name, strlen($table_prefix) + 1);
return $this->check_index_name_length($table_name, $index_name);
$index_name = substr($index_name, strlen($table_prefix));
return $this->check_index_name_length($table_name, $index_name, $throw_error);
}
// Try removing the table name then
if (strpos($index_name, $table_name) === 0)
// Try removing the remaining suffix part of table name then
$table_suffix = substr($table_name, strlen($table_prefix));
if (strpos($index_name, $table_suffix) === 0)
{
$index_name = substr($index_name, strlen($table_name) + 1);
return $this->check_index_name_length($table_name, $index_name);
// Remove the suffix and underscore separator between table_name and index_name
$index_name = substr($index_name, strlen($table_suffix) + 1);
return $this->check_index_name_length($table_name, $index_name, $throw_error);
}
if ($throw_error)

37
tests/dbal/db_tools_test.php
View File

@ -421,4 +421,41 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
$this->assertTrue($this->tools->sql_column_add('prefix_table_name', 'c_bug_13282', array('TINT:2')));
$this->assertTrue($this->tools->sql_column_exists('prefix_table_name', 'c_bug_13282'));
}
public function test_create_index_with_long_name()
{
// This constant is being used for checking table prefix.
$table_prefix = substr(CONFIG_TABLE, 0, -6); // strlen(config)
if (strlen($table_prefix) > 20)
{
$this->markTestIncomplete('The table prefix length is too long for proper testing of index shortening function.');
}
$table_suffix = str_repeat('a', 25 - strlen($table_prefix));
$table_name = $table_prefix . $table_suffix;
$this->tools->sql_create_table($table_name, $this->table_data);
// Index name and table suffix and table prefix have > 30 chars in total.
// Index name and table suffix have <= 30 chars in total.
$long_index_name = str_repeat('i', 30 - strlen($table_suffix));
$this->assertFalse($this->tools->sql_index_exists($table_name, $long_index_name));
$this->assertTrue($this->tools->sql_create_index($table_name, $long_index_name, array('c_timestamp')));
$this->assertTrue($this->tools->sql_index_exists($table_name, $long_index_name));
// Index name and table suffix have > 30 chars in total.
$very_long_index_name = str_repeat('i', 30);
$this->assertFalse($this->tools->sql_index_exists($table_name, $very_long_index_name));
$this->assertTrue($this->tools->sql_create_index($table_name, $very_long_index_name, array('c_timestamp')));
$this->assertTrue($this->tools->sql_index_exists($table_name, $very_long_index_name));
$this->tools->sql_table_drop($table_name);
// Index name has > 30 chars - that should not be possible.
$too_long_index_name = str_repeat('i', 31);
$this->assertFalse($this->tools->sql_index_exists('prefix_table_name', $too_long_index_name));
$this->setExpectedTriggerError(E_USER_ERROR);
$this->tools->sql_create_index('prefix_table_name', $too_long_index_name, array('c_timestamp'));
}
}