nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #2161443 [structure] Incorrect index choice shown when modifying an index

Browse Source
This commit is contained in:
Marc Delisle
2008-10-12 13:03:57 +00:00
parent 41670e64dc
commit b1b757406b
3 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
libraries/Index.class.php
View File

@@ -47,6 +47,13 @@ class PMA_Index
* @var string
*/
protected $_type = '';
/**
* The index choice (PRIMARY, UNIQUE, INDEX, FULLTEXT)
*
* @var string
*/
protected $_choice = '';
/**
* Various remarks.
@@ -257,6 +264,15 @@ class PMA_Index
if (isset($params['Packed'])) {
$this->_packed = $params['Packed'];
}
if ('PRIMARY' == $this->_name) {
$this->_choice = 'PRIMARY';
} elseif ('FULLTEXT' == $this->_type) {
$this->_choice = 'FULLTEXT';
} elseif ('0' == $this->_non_unique) {
$this->_choice = 'UNIQUE';
} else {
$this->_choice = 'INDEX';
}
}
public function getColumnCount()
@@ -291,11 +307,11 @@ class PMA_Index
}
/**
* Return a list of all index types
* Return a list of all index choices
*
* @return array index types
* @return array index choices
*/
static public function getTypes()
static public function getIndexChoices()
{
return array(
'PRIMARY',
@@ -305,20 +321,20 @@ class PMA_Index
);
}
public function getTypeSelector()
public function generateIndexSelector()
{
$html_options = '';
foreach (PMA_Index::getTypes() as $each_index_type) {
if ($each_index_type === 'PRIMARY'
&& $this->_name !== 'PRIMARY'
foreach (PMA_Index::getIndexChoices() as $each_index_choice) {
if ($each_index_choice === 'PRIMARY'
&& $this->_choice !== 'PRIMARY'
&& PMA_Index::getPrimary($this->_table, $this->_schema)) {
// skip PRIMARY if there is already one in the table
continue;
}
$html_options .= '<option value="' . $each_index_type . '"'
. (($this->_type == $each_index_type) ? ' selected="selected"' : '')
. '>'. $each_index_type . '</option>' . "\n";
$html_options .= '<option value="' . $each_index_choice . '"'
. (($this->_choice == $each_index_choice) ? ' selected="selected"' : '')
. '>'. $each_index_choice . '</option>' . "\n";
}
return $html_options;