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

Merge remote-tracking branch 'github-nickvergessen/ticket/12710' into develop-ascraeus

Browse source 
* github-nickvergessen/ticket/12710:
  [ticket/12710] Fix missing closing bracket
  [ticket/12710] Prefix column so it does not start with a number
  [ticket/12710] Pass the original column data to the create function
  [ticket/12710] Fix foreach generation
  [ticket/12710] Compare to uppercase version
  [ticket/12710] Do not try to match the uniqueness in the query
  [ticket/12710] Remove table_name from index_name before deleting and recreating them
  [ticket/12710] Can not use upper in oracles where claus
  [ticket/12710] Correctly select index name and compare to column name
  [ticket/12710] Fix "ORA-00972: identifier is too long [972]" on oracle
  [ticket/12710] Fix problems with creating unique indexes on oracle
  [ticket/12710] Correctly fetch unique and normal indexes only in MSSQL
  [ticket/12710] Fix changing the column type on oracle
  [ticket/12710] Prepare get_existing_indexes() for other DBMS
This commit is contained in:
Nils Adermann 2014-08-09 15:40:46 +02:00
commit 56ca276dcf
2 changed files with 198 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

155
phpBB/phpbb/db/tools.php
View file

@ -1816,7 +1816,8 @@ class tools
$old_return_statements = $this->return_statements; $old_return_statements = $this->return_statements;
$this->return_statements = true; $this->return_statements = true;
$indexes = $this->mssql_get_existing_indexes($table_name, $column_name); $indexes = $this->get_existing_indexes($table_name, $column_name);
$indexes = array_merge($indexes, $this->get_existing_indexes($table_name, $column_name, true));
// Drop any indexes // Drop any indexes
$recreate_indexes = array(); $recreate_indexes = array();
@ -2038,7 +2039,7 @@ class tools
break; break;
case 'oracle': case 'oracle':
$statements[] = 'ALTER TABLE ' . $table_name . 'add CONSTRAINT pk_' . $table_name . ' PRIMARY KEY (' . implode(', ', $column) . ')'; $statements[] = 'ALTER TABLE ' . $table_name . ' add CONSTRAINT pk_' . $table_name . ' PRIMARY KEY (' . implode(', ', $column) . ')';
break; break;
case 'sqlite': case 'sqlite':
@ -2273,11 +2274,24 @@ class tools
return array_map('strtolower', $index_array); return array_map('strtolower', $index_array);
} }
/**
* Removes table_name from the index_name if it is at the beginning
*
* @param $table_name
* @param $index_name
* @return string
*/
protected function strip_table_name_from_index_name($table_name, $index_name)
{
return (strpos(strtoupper($index_name), strtoupper($table_name)) === 0) ? substr($index_name, strlen($table_name) + 1) : $index_name;
}
/** /**
* Change column type (not name!) * Change column type (not name!)
*/ */
function sql_column_change($table_name, $column_name, $column_data, $inline = false) function sql_column_change($table_name, $column_name, $column_data, $inline = false)
{ {
$original_column_data = $column_data;
$column_data = $this->sql_prepare_column_data($table_name, $column_name, $column_data); $column_data = $this->sql_prepare_column_data($table_name, $column_name, $column_data);
$statements = array(); $statements = array();
@ -2289,12 +2303,14 @@ class tools
$old_return_statements = $this->return_statements; $old_return_statements = $this->return_statements;
$this->return_statements = true; $this->return_statements = true;
$indexes = $this->mssql_get_existing_indexes($table_name, $column_name); $indexes = $this->get_existing_indexes($table_name, $column_name);
$unique_indexes = $this->get_existing_indexes($table_name, $column_name, true);
// Drop any indexes // Drop any indexes
if (!empty($indexes)) if (!empty($indexes) || !empty($unique_indexes))
{ {
foreach ($indexes as $index_name => $index_data) $drop_indexes = array_merge(array_keys($indexes), array_keys($unique_indexes));
foreach ($drop_indexes as $index_name)
{ {
$result = $this->sql_index_drop($table_name, $index_name); $result = $this->sql_index_drop($table_name, $index_name);
$statements = array_merge($statements, $result); $statements = array_merge($statements, $result);
@ -2324,6 +2340,16 @@ class tools
} }
} }
if (!empty($unique_indexes))
{
// Recreate unique indexes after we changed the column
foreach ($unique_indexes as $index_name => $index_data)
{
$result = $this->sql_create_unique_index($table_name, $index_name, $index_data);
$statements = array_merge($statements, $result);
}
}
$this->return_statements = $old_return_statements; $this->return_statements = $old_return_statements;
break; break;
@ -2333,7 +2359,69 @@ class tools
break; break;
case 'oracle': case 'oracle':
$statements[] = 'ALTER TABLE ' . $table_name . ' MODIFY ' . $column_name . ' ' . $column_data['column_type_sql']; // We need the data here
$old_return_statements = $this->return_statements;
$this->return_statements = true;
// Get list of existing indexes
$indexes = $this->get_existing_indexes($table_name, $column_name);
$unique_indexes = $this->get_existing_indexes($table_name, $column_name, true);
// Drop any indexes
if (!empty($indexes) || !empty($unique_indexes))
{
$drop_indexes = array_merge(array_keys($indexes), array_keys($unique_indexes));
foreach ($drop_indexes as $index_name)
{
$result = $this->sql_index_drop($table_name, $this->strip_table_name_from_index_name($table_name, $index_name));
$statements = array_merge($statements, $result);
}
}
$temp_column_name = 'temp_' . substr(md5($column_name), 0, 25);
// Add a temporary table with the new type
$result = $this->sql_column_add($table_name, $temp_column_name, $original_column_data);
$statements = array_merge($statements, $result);
// Copy the data to the new column
$statements[] = 'UPDATE ' . $table_name . ' SET ' . $temp_column_name . ' = ' . $column_name;
// Drop the original column
$result = $this->sql_column_remove($table_name, $column_name);
$statements = array_merge($statements, $result);
// Recreate the original column with the new type
$result = $this->sql_column_add($table_name, $column_name, $original_column_data);
$statements = array_merge($statements, $result);
if (!empty($indexes))
{
// Recreate indexes after we changed the column
foreach ($indexes as $index_name => $index_data)
{
$result = $this->sql_create_index($table_name, $this->strip_table_name_from_index_name($table_name, $index_name), $index_data);
$statements = array_merge($statements, $result);
}
}
if (!empty($unique_indexes))
{
// Recreate unique indexes after we changed the column
foreach ($unique_indexes as $index_name => $index_data)
{
$result = $this->sql_create_unique_index($table_name, $this->strip_table_name_from_index_name($table_name, $index_name), $index_data);
$statements = array_merge($statements, $result);
}
}
// Copy the data to the original column
$statements[] = 'UPDATE ' . $table_name . ' SET ' . $column_name . ' = ' . $temp_column_name;
// Drop the temporary column again
$result = $this->sql_column_remove($table_name, $temp_column_name);
$statements = array_merge($statements, $result);
$this->return_statements = $old_return_statements;
break; break;
case 'postgres': case 'postgres':
@ -2517,11 +2605,30 @@ class tools
* *
* @param string $table_name * @param string $table_name
* @param string $column_name * @param string $column_name
* @param bool $unique Should we get unique indexes or normal ones
* @return array Array with Index name => columns * @return array Array with Index name => columns
*/ */
protected function mssql_get_existing_indexes($table_name, $column_name) public function get_existing_indexes($table_name, $column_name, $unique = false)
{ {
switch ($this->sql_layer)
{
case 'mysql_40':
case 'mysql_41':
case 'postgres':
case 'sqlite':
case 'sqlite3':
// Not supported
throw new \Exception('DBMS is not supported');
break;
}
$sql = '';
$existing_indexes = array(); $existing_indexes = array();
switch ($this->sql_layer)
{
case 'mssql':
case 'mssqlnative':
if ($this->mssql_is_sql_server_2000()) if ($this->mssql_is_sql_server_2000())
{ {
// http://msdn.microsoft.com/en-us/library/aa175912%28v=sql.80%29.aspx // http://msdn.microsoft.com/en-us/library/aa175912%28v=sql.80%29.aspx
@ -2535,7 +2642,8 @@ class tools
ON cols.colid = ixc.colid ON cols.colid = ixc.colid
AND cols.id = ix.id AND cols.id = ix.id
WHERE ix.id = object_id('{$table_name}') WHERE ix.id = object_id('{$table_name}')
AND cols.name = '{$column_name}'"; AND cols.name = '{$column_name}'
AND INDEXPROPERTY(ix.id, ix.name, 'IsUnique') = " . ($unique) ? '1' : '0';
} }
else else
{ {
@ -2548,15 +2656,28 @@ class tools
ON cols.column_id = ixc.column_id ON cols.column_id = ixc.column_id
AND cols.object_id = ix.object_id AND cols.object_id = ix.object_id
WHERE ix.object_id = object_id('{$table_name}') WHERE ix.object_id = object_id('{$table_name}')
AND cols.name = '{$column_name}'"; AND cols.name = '{$column_name}'
AND ix.is_unique = " . ($unique) ? '1' : '0';
}
break;
case 'oracle':
$sql = "SELECT ix.index_name AS phpbb_index_name, ix.uniqueness AS is_unique
FROM all_ind_columns ixc, all_indexes ix
WHERE ix.index_name = ixc.index_name
AND ixc.table_name = '" . strtoupper($table_name) . "'
AND ixc.column_name = '" . strtoupper($column_name) . "'";
break;
} }
$result = $this->db->sql_query($sql); $result = $this->db->sql_query($sql);
$existing_indexes = array();
while ($row = $this->db->sql_fetchrow($result)) while ($row = $this->db->sql_fetchrow($result))
{
if (!isset($row['is_unique']) || ($unique && $row['is_unique'] == 'UNIQUE') || (!$unique && $row['is_unique'] == 'NONUNIQUE'))
{ {
$existing_indexes[$row['phpbb_index_name']] = array(); $existing_indexes[$row['phpbb_index_name']] = array();
} }
}
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
if (empty($existing_indexes)) if (empty($existing_indexes))
@ -2564,6 +2685,10 @@ class tools
return array(); return array();
} }
switch ($this->sql_layer)
{
case 'mssql':
case 'mssqlnative':
if ($this->mssql_is_sql_server_2000()) if ($this->mssql_is_sql_server_2000())
{ {
$sql = "SELECT DISTINCT ix.name AS phpbb_index_name, cols.name AS phpbb_column_name $sql = "SELECT DISTINCT ix.name AS phpbb_index_name, cols.name AS phpbb_column_name
@ -2590,9 +2715,17 @@ class tools
WHERE ix.object_id = object_id('{$table_name}') WHERE ix.object_id = object_id('{$table_name}')
AND " . $this->db->sql_in_set('ix.name', array_keys($existing_indexes)); AND " . $this->db->sql_in_set('ix.name', array_keys($existing_indexes));
} }
break;
case 'oracle':
$sql = "SELECT index_name AS phpbb_index_name, column_name AS phpbb_column_name
FROM all_ind_columns
WHERE table_name = '" . strtoupper($table_name) . "'
AND " . $this->db->sql_in_set('index_name', array_keys($existing_indexes));
break;
}
$result = $this->db->sql_query($sql); $result = $this->db->sql_query($sql);
while ($row = $this->db->sql_fetchrow($result)) while ($row = $this->db->sql_fetchrow($result))
{ {
$existing_indexes[$row['phpbb_index_name']][] = $row['phpbb_column_name']; $existing_indexes[$row['phpbb_index_name']][] = $row['phpbb_column_name'];

12
tests/dbal/db_tools_test.php
View file

@ -288,13 +288,13 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
$this->assertTrue($this->tools->sql_column_exists('prefix_table_name', 'c_bug_12012_2')); $this->assertTrue($this->tools->sql_column_exists('prefix_table_name', 'c_bug_12012_2'));
// Create index over the column // Create index over the column
$this->assertFalse($this->tools->sql_index_exists('prefix_table_name', 'i_bug_12012_2')); $this->assertFalse($this->tools->sql_index_exists('prefix_table_name', 'bug_12012_2'));
$this->assertTrue($this->tools->sql_create_index('prefix_table_name', 'i_bug_12012_2', array('c_bug_12012_2', 'c_bool'))); $this->assertTrue($this->tools->sql_create_index('prefix_table_name', 'bug_12012_2', array('c_bug_12012_2', 'c_bool')));
$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', 'i_bug_12012_2')); $this->assertTrue($this->tools->sql_index_exists('prefix_table_name', 'bug_12012_2'));
$this->assertFalse($this->tools->sql_index_exists('prefix_table_name', 'i_bug_12012_3')); $this->assertFalse($this->tools->sql_index_exists('prefix_table_name', 'bug_12012_3'));
$this->assertTrue($this->tools->sql_create_index('prefix_table_name', 'i_bug_12012_3', array('c_bug_12012_2'))); $this->assertTrue($this->tools->sql_create_index('prefix_table_name', 'bug_12012_3', array('c_bug_12012_2')));
$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', 'i_bug_12012_3')); $this->assertTrue($this->tools->sql_index_exists('prefix_table_name', 'bug_12012_3'));
// Remove the column // Remove the column
$this->assertTrue($this->tools->sql_column_exists('prefix_table_name', 'c_bug_12012_2')); $this->assertTrue($this->tools->sql_column_exists('prefix_table_name', 'c_bug_12012_2'));