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

[ticket/12710] Do not try to match the uniqueness in the query

Browse source 
PHPBB3-12710
This commit is contained in:
Joas Schilling 2014-08-09 13:14:08 +02:00
parent 7d44995f16
commit f03a003bea
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2661,19 +2661,21 @@ class tools
break; break;
case 'oracle': case 'oracle':
$sql = "SELECT ix.index_name AS phpbb_index_name $sql = "SELECT ix.index_name AS phpbb_index_name, ix.uniqueness AS is_unique
FROM all_ind_columns ixc, all_indexes ix FROM all_ind_columns ixc, all_indexes ix
WHERE ix.index_name = ixc.index_name WHERE ix.index_name = ixc.index_name
AND ixc.table_name = '" . strtoupper($table_name) . "' AND ixc.table_name = '" . strtoupper($table_name) . "'
AND ixc.column_name = '" . strtoupper($column_name) . "' AND ixc.column_name = '" . strtoupper($column_name) . "'";
AND ix.uniqueness = " . ($unique) ? "'UNIQUE'" : "'NONUNIQUE'";
break; 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']] = array(); if (!isset($row['is_unique']) || ($unique && $row['is_unique'] == 'UNIQUE') || (!$unique && $row['is_unique'] == 'NONUNIQUE'))
{
$existing_indexes[$row['phpbb_index_name']] = array();
}
} }
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);