Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into error_reporting
This commit is contained in:
commit
78ae84d055
@ -1,219 +0,0 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* Display the form to edit/create an index
|
||||
*
|
||||
* @package PhpMyAdmin
|
||||
*/
|
||||
if (! defined('PHPMYADMIN')) {
|
||||
exit;
|
||||
}
|
||||
|
||||
if (isset($_REQUEST['index']) && is_array($_REQUEST['index'])) {
|
||||
// coming already from form
|
||||
$add_fields
|
||||
= count($_REQUEST['index']['columns']['names']) - $index->getColumnCount();
|
||||
if (isset($_REQUEST['add_fields'])) {
|
||||
$add_fields += $_REQUEST['added_fields'];
|
||||
}
|
||||
} elseif (isset($_REQUEST['create_index'])) {
|
||||
$add_fields = $_REQUEST['added_fields'];
|
||||
} else {
|
||||
$add_fields = 1;
|
||||
}// end preparing form values
|
||||
|
||||
$html = "";
|
||||
$html .= '<form action="tbl_indexes.php" method="post" name="index_frm" id="index_frm" class="ajax"'
|
||||
. 'onsubmit="if (typeof(this.elements[\'index[Key_name]\'].disabled) != \'undefined\') {'
|
||||
. 'this.elements[\'index[Key_name]\'].disabled = false}">';
|
||||
|
||||
$form_params = array(
|
||||
'db' => $db,
|
||||
'table' => $table,
|
||||
);
|
||||
|
||||
if (isset($_REQUEST['create_index'])) {
|
||||
$form_params['create_index'] = 1;
|
||||
} elseif (isset($_REQUEST['old_index'])) {
|
||||
$form_params['old_index'] = $_REQUEST['old_index'];
|
||||
} elseif (isset($_REQUEST['index'])) {
|
||||
$form_params['old_index'] = $_REQUEST['index'];
|
||||
}
|
||||
|
||||
$html .= PMA_URL_getHiddenInputs($form_params);
|
||||
|
||||
$html .= '<fieldset id="index_edit_fields">';
|
||||
|
||||
if ($GLOBALS['is_ajax_request'] != true) {
|
||||
$html .= '<legend>';
|
||||
if (isset($_REQUEST['create_index'])) {
|
||||
$html .= __('Add index');
|
||||
} else {
|
||||
$html .= __('Edit index');
|
||||
}
|
||||
$html .= '</legend>';
|
||||
}
|
||||
|
||||
$html .= '<div class="index_info">';
|
||||
|
||||
$html .= '<div>'
|
||||
. '<div class="label">'
|
||||
. '<strong>'
|
||||
. '<label for="input_index_name">'
|
||||
. __('Index name:')
|
||||
. PMA_Util::showHint(
|
||||
PMA_Message::notice(
|
||||
__('"PRIMARY" <b>must</b> be the name of'
|
||||
. ' and <b>only of</b> a primary key!'
|
||||
)
|
||||
)
|
||||
)
|
||||
. '</label>'
|
||||
. '</strong>'
|
||||
. '</div>'
|
||||
. '<input type="text" name="index[Key_name]" id="input_index_name" size="25"'
|
||||
. 'value="' . htmlspecialchars($index->getName()) . '"'
|
||||
. 'onfocus="this.select()" />'
|
||||
. '</div>';
|
||||
|
||||
if (PMA_MYSQL_INT_VERSION > 50500) {
|
||||
$html .= '<div>'
|
||||
. '<div class="label">'
|
||||
. '<strong>'
|
||||
. '<label for="input_index_comment">'
|
||||
. __('Comment:')
|
||||
. '</label>'
|
||||
. '</strong>'
|
||||
. '</div>'
|
||||
. '<input type="text" name="index[Index_comment]" id="input_index_comment" size="30"'
|
||||
. 'value="' . htmlspecialchars($index->getComment()) . '"'
|
||||
. 'onfocus="this.select()" />'
|
||||
. '</div>';
|
||||
}
|
||||
|
||||
$html .= '<div>'
|
||||
. '<div class="label">'
|
||||
. '<strong>'
|
||||
. '<label for="select_index_type">'
|
||||
. __('Index type:')
|
||||
. PMA_Util::showMySQLDocu('ALTER_TABLE')
|
||||
. '</label>'
|
||||
. '</strong>'
|
||||
. '</div>'
|
||||
. '<select name="index[Index_type]" id="select_index_type" >'
|
||||
. $index->generateIndexSelector()
|
||||
. '</select>'
|
||||
. '</div>';
|
||||
|
||||
$html .= '<div class="clearfloat"></div>';
|
||||
|
||||
$html .= '</div>';
|
||||
|
||||
$html .= '<table id="index_columns">';
|
||||
|
||||
$html .= '<thead>'
|
||||
. '<tr>'
|
||||
. '<th>' . __('Column') . '</th>'
|
||||
. '<th>' . __('Size') . '</th>'
|
||||
. '</tr>'
|
||||
. '</thead>';
|
||||
|
||||
$odd_row = true;
|
||||
$spatial_types = array(
|
||||
'geometry', 'point', 'linestring', 'polygon', 'multipoint',
|
||||
'multilinestring', 'multipolygon', 'geomtrycollection'
|
||||
);
|
||||
$html .= '<tbody>';
|
||||
foreach ($index->getColumns() as $column) {
|
||||
$html .= '<tr class="';
|
||||
$html .= $odd_row ? 'odd' : 'even';
|
||||
$html .= 'noclick">';
|
||||
$html .= '<td>';
|
||||
$html .= '<select name="index[columns][names][]">';
|
||||
$html .= '<option value="">-- ' . __('Ignore') . ' --</option>';
|
||||
foreach ($fields as $field_name => $field_type) {
|
||||
if (($index->getType() != 'FULLTEXT'
|
||||
|| preg_match('/(char|text)/i', $field_type))
|
||||
&& ($index->getType() != 'SPATIAL'
|
||||
|| in_array($field_type, $spatial_types))
|
||||
) {
|
||||
$html .= '<option value="' . htmlspecialchars($field_name) . '"'
|
||||
. (($field_name == $column->getName())
|
||||
? ' selected="selected"'
|
||||
: '') . '>'
|
||||
. htmlspecialchars($field_name) . ' ['
|
||||
. htmlspecialchars($field_type) . ']'
|
||||
. '</option>' . "\n";
|
||||
}
|
||||
} // end foreach $fields
|
||||
$html .= '</select>';
|
||||
$html .= '</td>';
|
||||
$html .= '<td>';
|
||||
$html .= '<input type="text" size="5" onfocus="this.select()"'
|
||||
. 'name="index[columns][sub_parts][]" value="';
|
||||
if ($index->getType() != 'SPATIAL') {
|
||||
$html .= $column->getSubPart();
|
||||
}
|
||||
$html .= '"/>';
|
||||
$html .= '</td>';
|
||||
$html .= '</tr>';
|
||||
$odd_row = !$odd_row;
|
||||
} // end foreach $edited_index_info['Sequences']
|
||||
|
||||
for ($i = 0; $i < $add_fields; $i++) {
|
||||
$html .= '<tr class="';
|
||||
$html .= $odd_row ? 'odd' : 'even';
|
||||
$html .= 'noclick">';
|
||||
$html .= '<td>';
|
||||
$html .= '<select name="index[columns][names][]">';
|
||||
$html .= '<option value="">-- ' . __('Ignore') . ' --</option>';
|
||||
foreach ($fields as $field_name => $field_type) {
|
||||
$html .= '<option value="' . htmlspecialchars($field_name) . '">'
|
||||
. htmlspecialchars($field_name) . ' ['
|
||||
. htmlspecialchars($field_type) . ']'
|
||||
. '</option>' . "\n";
|
||||
} // end foreach $fields
|
||||
$html .= '</select>';
|
||||
$html .= '</td>';
|
||||
$html .= '<td>'
|
||||
. '<input type="text" size="5" onfocus="this.select()"'
|
||||
. 'name="index[columns][sub_parts][]" value="" />'
|
||||
. '</td>';
|
||||
$html .= '</tr>';
|
||||
$odd_row = !$odd_row;
|
||||
} // end foreach $edited_index_info['Sequences']
|
||||
|
||||
$html .= '</tbody>';
|
||||
|
||||
$html .= '</table>';
|
||||
|
||||
$html .= '</fieldset>';
|
||||
|
||||
$html .= '<fieldset class="tblFooters">';
|
||||
if ($GLOBALS['is_ajax_request'] != true || ! empty($_REQUEST['ajax_page_request'])) {
|
||||
$html .= '<input type="submit" name="do_save_data" value="' . __('Save') . '" />';
|
||||
$html .= '<span id="addMoreColumns">';
|
||||
$html .= __('Or') . ' ';
|
||||
$html .= printf(
|
||||
__('Add %s column(s) to index') . "\n",
|
||||
'<input type="text" name="added_fields" size="2" value="1" />'
|
||||
);
|
||||
$html .= '<input type="submit" name="add_fields" value="' . __('Go') . '" />' . "\n";
|
||||
$html .= '</span>';
|
||||
} else {
|
||||
$btn_value = sprintf(__('Add %s column(s) to index'), 1);
|
||||
$html .= '<div class="slider"></div>';
|
||||
$html .= '<div class="add_fields">';
|
||||
$html .= '<input type="submit" value="' . $btn_value . '" />';
|
||||
$html .= '</div>';
|
||||
}
|
||||
$html .= '</fieldset>';
|
||||
|
||||
$html .= '</form>';
|
||||
|
||||
$response = PMA_Response::getInstance();
|
||||
$response->addHTML($html);
|
||||
$header = $response->getHeader();
|
||||
$scripts = $header->getScripts();
|
||||
$scripts->addFile('indexes.js');
|
||||
?>
|
||||
406
libraries/tbl_indexes.lib.php
Normal file
406
libraries/tbl_indexes.lib.php
Normal file
@ -0,0 +1,406 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* Set of functions related to table indexes
|
||||
*
|
||||
* @package PhpMyAdmin
|
||||
*/
|
||||
if (! defined('PHPMYADMIN')) {
|
||||
exit;
|
||||
}
|
||||
|
||||
/**
|
||||
* Function to get the name and type of the columns of a table
|
||||
*
|
||||
* @param string $db current database
|
||||
* @param string $table current table
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
function PMA_getNameAndTypeOfTheColumns($db, $table)
|
||||
{
|
||||
$columns = array();
|
||||
foreach ($GLOBALS['dbi']->getColumnsFull($db, $table) as $row) {
|
||||
if (preg_match('@^(set|enum)\((.+)\)$@i', $row['Type'], $tmp)) {
|
||||
$tmp[2] = substr(
|
||||
preg_replace('@([^,])\'\'@', '\\1\\\'', ',' . $tmp[2]), 1
|
||||
);
|
||||
$columns[$row['Field']] = $tmp[1] . '('
|
||||
. str_replace(',', ', ', $tmp[2]) . ')';
|
||||
} else {
|
||||
$columns[$row['Field']] = $row['Type'];
|
||||
}
|
||||
} // end while
|
||||
|
||||
return $columns;
|
||||
}
|
||||
|
||||
/**
|
||||
* Function to handle the creation or edit of an index
|
||||
*
|
||||
* @param string $db current db
|
||||
* @param string $table current table
|
||||
* @param Object $index current index
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
function PMA_handleCreateOrEditIndex($db, $table, $index)
|
||||
{
|
||||
$error = false;
|
||||
|
||||
$sql_query = PMA_getSqlQueryForIndexCreateOrEdit($db, $table, $index, $error);
|
||||
|
||||
if (! $error) {
|
||||
$GLOBALS['dbi']->query($sql_query);
|
||||
$message = PMA_Message::success(
|
||||
__('Table %1$s has been altered successfully')
|
||||
);
|
||||
$message->addParam($table);
|
||||
|
||||
if ($GLOBALS['is_ajax_request'] == true) {
|
||||
$response = PMA_Response::getInstance();
|
||||
$response->addJSON('message', $message);
|
||||
$response->addJSON('index_table', PMA_Index::getView($table, $db));
|
||||
$response->addJSON(
|
||||
'sql_query',
|
||||
PMA_Util::getMessage(null, $sql_query)
|
||||
);
|
||||
} else {
|
||||
$active_page = 'tbl_structure.php';
|
||||
include 'tbl_structure.php';
|
||||
}
|
||||
exit;
|
||||
} else {
|
||||
$response = PMA_Response::getInstance();
|
||||
$response->isSuccess(false);
|
||||
$response->addJSON('message', $error);
|
||||
exit;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Function to get the sql query for index creation or edit
|
||||
*
|
||||
* @param string $db current db
|
||||
* @param string $table current table
|
||||
* @param Object $index current index
|
||||
* @param bool &$error whether error occoured or not
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
function PMA_getSqlQueryForIndexCreateOrEdit($db, $table, $index, &$error)
|
||||
{
|
||||
// $sql_query is the one displayed in the query box
|
||||
$sql_query = 'ALTER TABLE ' . PMA_Util::backquote($db)
|
||||
. '.' . PMA_Util::backquote($table);
|
||||
|
||||
// Drops the old index
|
||||
if (! empty($_REQUEST['old_index'])) {
|
||||
if ($_REQUEST['old_index'] == 'PRIMARY') {
|
||||
$sql_query .= ' DROP PRIMARY KEY,';
|
||||
} else {
|
||||
$sql_query .= ' DROP INDEX '
|
||||
. PMA_Util::backquote($_REQUEST['old_index']) . ',';
|
||||
}
|
||||
} // end if
|
||||
|
||||
// Builds the new one
|
||||
switch ($index->getType()) {
|
||||
case 'PRIMARY':
|
||||
if ($index->getName() == '') {
|
||||
$index->setName('PRIMARY');
|
||||
} elseif ($index->getName() != 'PRIMARY') {
|
||||
$error = PMA_Message::error(
|
||||
__('The name of the primary key must be "PRIMARY"!')
|
||||
);
|
||||
}
|
||||
$sql_query .= ' ADD PRIMARY KEY';
|
||||
break;
|
||||
case 'FULLTEXT':
|
||||
case 'UNIQUE':
|
||||
case 'INDEX':
|
||||
case 'SPATIAL':
|
||||
if ($index->getName() == 'PRIMARY') {
|
||||
$error = PMA_Message::error(__('Can\'t rename index to PRIMARY!'));
|
||||
}
|
||||
$sql_query .= ' ADD ' . $index->getType() . ' '
|
||||
. ($index->getName() ? PMA_Util::backquote($index->getName()) : '');
|
||||
break;
|
||||
} // end switch
|
||||
|
||||
$index_fields = array();
|
||||
foreach ($index->getColumns() as $key => $column) {
|
||||
$index_fields[$key] = PMA_Util::backquote($column->getName());
|
||||
if ($column->getSubPart()) {
|
||||
$index_fields[$key] .= '(' . $column->getSubPart() . ')';
|
||||
}
|
||||
} // end while
|
||||
|
||||
if (empty($index_fields)) {
|
||||
$error = PMA_Message::error(__('No index parts defined!'));
|
||||
} else {
|
||||
$sql_query .= ' (' . implode(', ', $index_fields) . ')';
|
||||
}
|
||||
|
||||
if (PMA_MYSQL_INT_VERSION > 50500) {
|
||||
$sql_query .= "COMMENT '"
|
||||
. PMA_Util::sqlAddSlashes($index->getComment())
|
||||
. "'";
|
||||
}
|
||||
$sql_query .= ';';
|
||||
|
||||
return $sql_query;
|
||||
}
|
||||
|
||||
/**
|
||||
* Function to prepare the form values for index
|
||||
*
|
||||
* @param string $db curent database
|
||||
* @param string $table current table
|
||||
*
|
||||
* @return PMA_Index
|
||||
*/
|
||||
function PMA_prepareFormValues($db, $table)
|
||||
{
|
||||
if (isset($_REQUEST['index'])) {
|
||||
if (is_array($_REQUEST['index'])) {
|
||||
// coming already from form
|
||||
$index = new PMA_Index($_REQUEST['index']);
|
||||
} else {
|
||||
$index = PMA_Index::singleton($db, $table, $_REQUEST['index']);
|
||||
}
|
||||
} else {
|
||||
$index = new PMA_Index;
|
||||
}
|
||||
|
||||
return $index;
|
||||
}
|
||||
|
||||
/**
|
||||
* Function to get the number of fields for the form
|
||||
*
|
||||
* @param Object $index index
|
||||
*
|
||||
* @return int
|
||||
*/
|
||||
function PMA_getNumberOfFieldsForForm($index)
|
||||
{
|
||||
if (isset($_REQUEST['index']) && is_array($_REQUEST['index'])) {
|
||||
// coming already from form
|
||||
$add_fields
|
||||
= count($_REQUEST['index']['columns']['names'])
|
||||
- $index->getColumnCount();
|
||||
if (isset($_REQUEST['add_fields'])) {
|
||||
$add_fields += $_REQUEST['added_fields'];
|
||||
}
|
||||
} elseif (isset($_REQUEST['create_index'])) {
|
||||
$add_fields = $_REQUEST['added_fields'];
|
||||
} else {
|
||||
$add_fields = 1;
|
||||
}// end preparing form values
|
||||
|
||||
return $add_fields;
|
||||
}
|
||||
|
||||
/**
|
||||
* Function to get form parameters
|
||||
*
|
||||
* @param string $db current db
|
||||
* @param string $table current table
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
function PMA_getFormParameters($db, $table)
|
||||
{
|
||||
$form_params = array(
|
||||
'db' => $db,
|
||||
'table' => $table,
|
||||
);
|
||||
|
||||
if (isset($_REQUEST['create_index'])) {
|
||||
$form_params['create_index'] = 1;
|
||||
} elseif (isset($_REQUEST['old_index'])) {
|
||||
$form_params['old_index'] = $_REQUEST['old_index'];
|
||||
} elseif (isset($_REQUEST['index'])) {
|
||||
$form_params['old_index'] = $_REQUEST['index'];
|
||||
}
|
||||
|
||||
return $form_params;
|
||||
}
|
||||
|
||||
/**
|
||||
* Function to get html for displaying the index form
|
||||
*
|
||||
* @param array $fields fields
|
||||
* @param Object $index index
|
||||
* @param array $form_params form parameters
|
||||
* @param int $add_fields number of fields in the form
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
function PMA_getHtmlForIndexForm($fields, $index, $form_params,$add_fields)
|
||||
{
|
||||
$html = "";
|
||||
$html .= '<form action="tbl_indexes.php" method="post" name="index_frm" id="'
|
||||
. 'index_frm" class="ajax"'
|
||||
. 'onsubmit="if (typeof(this.elements[\'index[Key_name]\'].disabled) !='
|
||||
. ' \'undefined\') {'
|
||||
. 'this.elements[\'index[Key_name]\'].disabled = false}">';
|
||||
|
||||
$html .= PMA_URL_getHiddenInputs($form_params);
|
||||
|
||||
$html .= '<fieldset id="index_edit_fields">';
|
||||
|
||||
$html .= '<div class="index_info">';
|
||||
|
||||
$html .= '<div>'
|
||||
. '<div class="label">'
|
||||
. '<strong>'
|
||||
. '<label for="input_index_name">'
|
||||
. __('Index name:')
|
||||
. PMA_Util::showHint(
|
||||
PMA_Message::notice(
|
||||
__(
|
||||
'"PRIMARY" <b>must</b> be the name of'
|
||||
. ' and <b>only of</b> a primary key!'
|
||||
)
|
||||
)
|
||||
)
|
||||
. '</label>'
|
||||
. '</strong>'
|
||||
. '</div>'
|
||||
. '<input type="text" name="index[Key_name]" id="input_index_name"'
|
||||
. ' size="25"'
|
||||
. 'value="' . htmlspecialchars($index->getName()) . '"'
|
||||
. 'onfocus="this.select()" />'
|
||||
. '</div>';
|
||||
|
||||
if (PMA_MYSQL_INT_VERSION > 50500) {
|
||||
$html .= '<div>'
|
||||
. '<div class="label">'
|
||||
. '<strong>'
|
||||
. '<label for="input_index_comment">'
|
||||
. __('Comment:')
|
||||
. '</label>'
|
||||
. '</strong>'
|
||||
. '</div>'
|
||||
. '<input type="text" name="index[Index_comment]" '
|
||||
. 'id="input_index_comment" size="30"'
|
||||
. 'value="' . htmlspecialchars($index->getComment()) . '"'
|
||||
. 'onfocus="this.select()" />'
|
||||
. '</div>';
|
||||
}
|
||||
|
||||
$html .= '<div>'
|
||||
. '<div class="label">'
|
||||
. '<strong>'
|
||||
. '<label for="select_index_type">'
|
||||
. __('Index type:')
|
||||
. PMA_Util::showMySQLDocu('ALTER_TABLE')
|
||||
. '</label>'
|
||||
. '</strong>'
|
||||
. '</div>'
|
||||
. '<select name="index[Index_type]" id="select_index_type" >'
|
||||
. $index->generateIndexSelector()
|
||||
. '</select>'
|
||||
. '</div>';
|
||||
|
||||
$html .= '<div class="clearfloat"></div>';
|
||||
|
||||
$html .= '</div>';
|
||||
|
||||
$html .= '<table id="index_columns">';
|
||||
|
||||
$html .= '<thead>'
|
||||
. '<tr>'
|
||||
. '<th>' . __('Column') . '</th>'
|
||||
. '<th>' . __('Size') . '</th>'
|
||||
. '</tr>'
|
||||
. '</thead>';
|
||||
|
||||
$odd_row = true;
|
||||
$spatial_types = array(
|
||||
'geometry', 'point', 'linestring', 'polygon', 'multipoint',
|
||||
'multilinestring', 'multipolygon', 'geomtrycollection'
|
||||
);
|
||||
$html .= '<tbody>';
|
||||
foreach ($index->getColumns() as $column) {
|
||||
$html .= '<tr class="';
|
||||
$html .= $odd_row ? 'odd' : 'even';
|
||||
$html .= 'noclick">';
|
||||
$html .= '<td>';
|
||||
$html .= '<select name="index[columns][names][]">';
|
||||
$html .= '<option value="">-- ' . __('Ignore') . ' --</option>';
|
||||
foreach ($fields as $field_name => $field_type) {
|
||||
if (($index->getType() != 'FULLTEXT'
|
||||
|| preg_match('/(char|text)/i', $field_type))
|
||||
&& ($index->getType() != 'SPATIAL'
|
||||
|| in_array($field_type, $spatial_types))
|
||||
) {
|
||||
$html .= '<option value="' . htmlspecialchars($field_name) . '"'
|
||||
. (($field_name == $column->getName())
|
||||
? ' selected="selected"'
|
||||
: '') . '>'
|
||||
. htmlspecialchars($field_name) . ' ['
|
||||
. htmlspecialchars($field_type) . ']'
|
||||
. '</option>' . "\n";
|
||||
}
|
||||
} // end foreach $fields
|
||||
$html .= '</select>';
|
||||
$html .= '</td>';
|
||||
$html .= '<td>';
|
||||
$html .= '<input type="text" size="5" onfocus="this.select()"'
|
||||
. 'name="index[columns][sub_parts][]" value="';
|
||||
if ($index->getType() != 'SPATIAL') {
|
||||
$html .= $column->getSubPart();
|
||||
}
|
||||
$html .= '"/>';
|
||||
$html .= '</td>';
|
||||
$html .= '</tr>';
|
||||
$odd_row = !$odd_row;
|
||||
} // end foreach $edited_index_info['Sequences']
|
||||
|
||||
for ($i = 0; $i < $add_fields; $i++) {
|
||||
$html .= '<tr class="';
|
||||
$html .= $odd_row ? 'odd' : 'even';
|
||||
$html .= 'noclick">';
|
||||
$html .= '<td>';
|
||||
$html .= '<select name="index[columns][names][]">';
|
||||
$html .= '<option value="">-- ' . __('Ignore') . ' --</option>';
|
||||
foreach ($fields as $field_name => $field_type) {
|
||||
$html .= '<option value="' . htmlspecialchars($field_name) . '">'
|
||||
. htmlspecialchars($field_name) . ' ['
|
||||
. htmlspecialchars($field_type) . ']'
|
||||
. '</option>' . "\n";
|
||||
} // end foreach $fields
|
||||
$html .= '</select>';
|
||||
$html .= '</td>';
|
||||
$html .= '<td>'
|
||||
. '<input type="text" size="5" onfocus="this.select()"'
|
||||
. 'name="index[columns][sub_parts][]" value="" />'
|
||||
. '</td>';
|
||||
$html .= '</tr>';
|
||||
$odd_row = !$odd_row;
|
||||
} // end foreach $edited_index_info['Sequences']
|
||||
|
||||
$html .= '</tbody>';
|
||||
|
||||
$html .= '</table>';
|
||||
|
||||
$html .= '</fieldset>';
|
||||
|
||||
$html .= '<fieldset class="tblFooters">';
|
||||
|
||||
$btn_value = sprintf(__('Add %s column(s) to index'), 1);
|
||||
$html .= '<div class="slider"></div>';
|
||||
$html .= '<div class="add_fields">';
|
||||
$html .= '<input type="submit" value="' . $btn_value . '" />';
|
||||
$html .= '</div>';
|
||||
|
||||
$html .= '</fieldset>';
|
||||
|
||||
$html .= '</form>';
|
||||
|
||||
return $html;
|
||||
}
|
||||
?>
|
||||
39
po/zh_CN.po
39
po/zh_CN.po
@ -4,7 +4,7 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.1-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2013-08-18 06:16-0400\n"
|
||||
"PO-Revision-Date: 2013-08-31 03:56+0200\n"
|
||||
"PO-Revision-Date: 2013-08-31 16:18+0200\n"
|
||||
"Last-Translator: shanyan baishui <Siramizu@gmail.com>\n"
|
||||
"Language-Team: Simplified Chinese "
|
||||
"<http://l10n.cihar.com/projects/phpmyadmin/master/zh_CN/>\n"
|
||||
@ -5197,49 +5197,49 @@ msgstr "快速访问图标的目标"
|
||||
msgid ""
|
||||
"Defines the minimum number of items (tables, views, routines and events) to "
|
||||
"display a filter box."
|
||||
msgstr "显示快速搜索框的最少项目(表,视图,例程和事件)数量。"
|
||||
msgstr "设置达到多少个项(表、视图、程序和事件)时将显示筛选框。"
|
||||
|
||||
#: libraries/config/messages.inc.php:310
|
||||
msgid "Minimum number of items to display the filter box"
|
||||
msgstr "过滤框显示的最小条目数量"
|
||||
msgstr "显示筛选框的最少项数"
|
||||
|
||||
#: libraries/config/messages.inc.php:311
|
||||
msgid "Minimum number of databases to display the database filter box"
|
||||
msgstr "数据库搜索框显示的最少数据表数量"
|
||||
msgstr "设置达到多少个数据库时将显示数据库筛选框"
|
||||
|
||||
#: libraries/config/messages.inc.php:312
|
||||
msgid ""
|
||||
"Group items in the navigation tree (determined by the separator defined "
|
||||
"below)"
|
||||
msgstr "在导航列表中组合项目(以下述的分隔符来区分)"
|
||||
msgstr "将导航树中的项分组(根据下面设置的分隔符分组)"
|
||||
|
||||
#: libraries/config/messages.inc.php:313
|
||||
msgid "Group items in the tree"
|
||||
msgstr "在树列表中组合项目"
|
||||
msgstr "分组树中的项"
|
||||
|
||||
#: libraries/config/messages.inc.php:314
|
||||
msgid "String that separates databases into different tree levels"
|
||||
msgstr "将数据库分为不同树级的分割符"
|
||||
msgstr "将数据库分为不同层级的字符串"
|
||||
|
||||
#: libraries/config/messages.inc.php:315
|
||||
msgid "Database tree separator"
|
||||
msgstr "树状数据库分隔符"
|
||||
msgstr "数据库树分隔符"
|
||||
|
||||
#: libraries/config/messages.inc.php:316
|
||||
msgid "String that separates tables into different tree levels"
|
||||
msgstr "将表分为不同树级的分隔符"
|
||||
msgstr "将表分为不同层级的字符串"
|
||||
|
||||
#: libraries/config/messages.inc.php:317
|
||||
msgid "Table tree separator"
|
||||
msgstr "树形表分隔符"
|
||||
msgstr "表树分隔符"
|
||||
|
||||
#: libraries/config/messages.inc.php:318
|
||||
msgid "Maximum table tree depth"
|
||||
msgstr "数据表树最大深度"
|
||||
msgstr "表树最大深度"
|
||||
|
||||
#: libraries/config/messages.inc.php:319
|
||||
msgid "Highlight server under the mouse cursor"
|
||||
msgstr "高亮显示鼠标所在位置的服务器"
|
||||
msgstr "高亮鼠标指针所在位置的服务器"
|
||||
|
||||
#: libraries/config/messages.inc.php:320
|
||||
msgid "Enable highlighting"
|
||||
@ -5247,7 +5247,7 @@ msgstr "启用高亮"
|
||||
|
||||
#: libraries/config/messages.inc.php:321
|
||||
msgid "Maximum number of recently used tables; set 0 to disable"
|
||||
msgstr "最近使用的表数的最大值;设为0则关闭"
|
||||
msgstr "最近使用的表的最大数量;设为 0 为禁用"
|
||||
|
||||
#: libraries/config/messages.inc.php:322
|
||||
msgid "Recently used tables"
|
||||
@ -5259,11 +5259,11 @@ msgstr "它们是编辑、复制和删除链接"
|
||||
|
||||
#: libraries/config/messages.inc.php:324
|
||||
msgid "Where to show the table row links"
|
||||
msgstr "表中每行数据操作链接位置"
|
||||
msgstr "表行链接显示位置"
|
||||
|
||||
#: libraries/config/messages.inc.php:325
|
||||
msgid "Use natural order for sorting table and database names"
|
||||
msgstr "为数据库和数据表名使用自然排序"
|
||||
msgstr "为表和数据库名使用自然排序"
|
||||
|
||||
#: libraries/config/messages.inc.php:326
|
||||
msgid "Natural order"
|
||||
@ -5272,13 +5272,12 @@ msgstr "自然排序"
|
||||
#: libraries/config/messages.inc.php:327 libraries/config/messages.inc.php:341
|
||||
#: libraries/config/messages.inc.php:343
|
||||
msgid "Use only icons, only text or both"
|
||||
msgstr "仅使用图标、文本或都使用"
|
||||
msgstr "仅使用图标、文字或都有"
|
||||
|
||||
#: libraries/config/messages.inc.php:328
|
||||
#, fuzzy
|
||||
#| msgid "Iconic navigation bar"
|
||||
msgid "Table navigation bar"
|
||||
msgstr "导航条显示"
|
||||
msgstr "表导航条"
|
||||
|
||||
#: libraries/config/messages.inc.php:329
|
||||
msgid "use GZip output buffering for increased speed in HTTP transfers"
|
||||
@ -5292,9 +5291,7 @@ msgstr "GZip 输出缓冲"
|
||||
msgid ""
|
||||
"[kbd]SMART[/kbd] - i.e. descending order for columns of type TIME, DATE, "
|
||||
"DATETIME and TIMESTAMP, ascending order otherwise"
|
||||
msgstr ""
|
||||
"[kbd]SMART[/kbd] - 如:对 TIME、DATE、DATETIME 和 TIMESTAMP 类型的字段递减排"
|
||||
"序,其他字段递增"
|
||||
msgstr "[kbd]SMART[/kbd] - 即对 TIME、DATE、DATETIME 和 TIMESTAMP 类型的字段递减排序,其它字段递增"
|
||||
|
||||
#: libraries/config/messages.inc.php:332
|
||||
msgid "Default sorting order"
|
||||
|
||||
135
tbl_indexes.php
135
tbl_indexes.php
@ -12,130 +12,17 @@
|
||||
require_once 'libraries/common.inc.php';
|
||||
require_once 'libraries/Index.class.php';
|
||||
require_once 'libraries/tbl_common.inc.php';
|
||||
require_once 'libraries/tbl_indexes.lib.php';
|
||||
|
||||
// Get fields and stores their name/type
|
||||
$fields = array();
|
||||
foreach ($GLOBALS['dbi']->getColumnsFull($db, $table) as $row) {
|
||||
if (preg_match('@^(set|enum)\((.+)\)$@i', $row['Type'], $tmp)) {
|
||||
$tmp[2] = substr(
|
||||
preg_replace('@([^,])\'\'@', '\\1\\\'', ',' . $tmp[2]), 1
|
||||
);
|
||||
$fields[$row['Field']] = $tmp[1] . '('
|
||||
. str_replace(',', ', ', $tmp[2]) . ')';
|
||||
} else {
|
||||
$fields[$row['Field']] = $row['Type'];
|
||||
}
|
||||
} // end while
|
||||
|
||||
// Prepares the form values
|
||||
if (isset($_REQUEST['index'])) {
|
||||
if (is_array($_REQUEST['index'])) {
|
||||
// coming already from form
|
||||
$index = new PMA_Index($_REQUEST['index']);
|
||||
} else {
|
||||
$index = PMA_Index::singleton($db, $table, $_REQUEST['index']);
|
||||
}
|
||||
} else {
|
||||
$index = new PMA_Index;
|
||||
}
|
||||
|
||||
$index = PMA_prepareFormValues($db, $table);
|
||||
/**
|
||||
* Process the data from the edit/create index form,
|
||||
* run the query to build the new index
|
||||
* and moves back to "tbl_sql.php"
|
||||
*/
|
||||
if (isset($_REQUEST['do_save_data'])) {
|
||||
$error = false;
|
||||
|
||||
// $sql_query is the one displayed in the query box
|
||||
$sql_query = 'ALTER TABLE ' . PMA_Util::backquote($db)
|
||||
. '.' . PMA_Util::backquote($table);
|
||||
|
||||
// Drops the old index
|
||||
if (! empty($_REQUEST['old_index'])) {
|
||||
if ($_REQUEST['old_index'] == 'PRIMARY') {
|
||||
$sql_query .= ' DROP PRIMARY KEY,';
|
||||
} else {
|
||||
$sql_query .= ' DROP INDEX '
|
||||
. PMA_Util::backquote($_REQUEST['old_index']) . ',';
|
||||
}
|
||||
} // end if
|
||||
|
||||
// Builds the new one
|
||||
switch ($index->getType()) {
|
||||
case 'PRIMARY':
|
||||
if ($index->getName() == '') {
|
||||
$index->setName('PRIMARY');
|
||||
} elseif ($index->getName() != 'PRIMARY') {
|
||||
$error = PMA_Message::error(
|
||||
__('The name of the primary key must be "PRIMARY"!')
|
||||
);
|
||||
}
|
||||
$sql_query .= ' ADD PRIMARY KEY';
|
||||
break;
|
||||
case 'FULLTEXT':
|
||||
case 'UNIQUE':
|
||||
case 'INDEX':
|
||||
case 'SPATIAL':
|
||||
if ($index->getName() == 'PRIMARY') {
|
||||
$error = PMA_Message::error(__('Can\'t rename index to PRIMARY!'));
|
||||
}
|
||||
$sql_query .= ' ADD ' . $index->getType() . ' '
|
||||
. ($index->getName() ? PMA_Util::backquote($index->getName()) : '');
|
||||
break;
|
||||
} // end switch
|
||||
|
||||
$index_fields = array();
|
||||
foreach ($index->getColumns() as $key => $column) {
|
||||
$index_fields[$key] = PMA_Util::backquote($column->getName());
|
||||
if ($column->getSubPart()) {
|
||||
$index_fields[$key] .= '(' . $column->getSubPart() . ')';
|
||||
}
|
||||
} // end while
|
||||
|
||||
if (empty($index_fields)) {
|
||||
$error = PMA_Message::error(__('No index parts defined!'));
|
||||
} else {
|
||||
$sql_query .= ' (' . implode(', ', $index_fields) . ')';
|
||||
}
|
||||
|
||||
if (PMA_MYSQL_INT_VERSION > 50500) {
|
||||
$sql_query .= "COMMENT '"
|
||||
. PMA_Util::sqlAddSlashes($index->getComment())
|
||||
. "'";
|
||||
}
|
||||
$sql_query .= ';';
|
||||
|
||||
if (! $error) {
|
||||
$GLOBALS['dbi']->query($sql_query);
|
||||
$message = PMA_Message::success(
|
||||
__('Table %1$s has been altered successfully')
|
||||
);
|
||||
$message->addParam($table);
|
||||
|
||||
if ($GLOBALS['is_ajax_request'] == true) {
|
||||
$response = PMA_Response::getInstance();
|
||||
$response->addJSON('message', $message);
|
||||
$response->addJSON('index_table', PMA_Index::getView($table, $db));
|
||||
$response->addJSON(
|
||||
'sql_query',
|
||||
PMA_Util::getMessage(null, $sql_query)
|
||||
);
|
||||
} else {
|
||||
$active_page = 'tbl_structure.php';
|
||||
include 'tbl_structure.php';
|
||||
}
|
||||
exit;
|
||||
} else {
|
||||
if ($GLOBALS['is_ajax_request'] == true) {
|
||||
$response = PMA_Response::getInstance();
|
||||
$response->isSuccess(false);
|
||||
$response->addJSON('message', $error);
|
||||
exit;
|
||||
} else {
|
||||
$error->display();
|
||||
}
|
||||
}
|
||||
PMA_handleCreateOrEditIndex($db, $table, $index);
|
||||
} // end builds the new index
|
||||
|
||||
|
||||
@ -143,5 +30,19 @@ if (isset($_REQUEST['do_save_data'])) {
|
||||
* Display the form to edit/create an index
|
||||
*/
|
||||
require_once 'libraries/tbl_info.inc.php';
|
||||
require_once 'libraries/display_indexes.lib.php';
|
||||
|
||||
$add_fields = PMA_getNumberOfFieldsForForm($index);
|
||||
|
||||
$form_params = PMA_getFormParameters($db, $table);
|
||||
|
||||
// Get fields and stores their name/type
|
||||
$fields = PMA_getNameAndTypeOfTheColumns($db, $table);
|
||||
|
||||
$html = PMA_getHtmlForIndexForm($fields, $index, $form_params, $add_fields);
|
||||
|
||||
$response = PMA_Response::getInstance();
|
||||
$response->addHTML($html);
|
||||
$header = $response->getHeader();
|
||||
$scripts = $header->getScripts();
|
||||
$scripts->addFile('indexes.js');
|
||||
?>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user