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

Merge branch 'test-for-missing-redirection'

Browse Source
This commit is contained in:
Marc Delisle 2012-12-19 08:04:40 -05:00
commit 7e960403fe
7 changed files with 108 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/common.inc.php
View File

@ -398,7 +398,6 @@ $goto_whitelist = array(
'server_variables.php',
'sql.php',
'tbl_addfield.php',
'tbl_alter.php',
'tbl_change.php',
'tbl_create.php',
'tbl_import.php',

4
libraries/plugins/auth/AuthenticationCookie.class.php
View File

@ -21,10 +21,6 @@ if (! empty($_REQUEST['target'])) {
$GLOBALS['target'] = $_REQUEST['target'];
} else if (PMA_getenv('SCRIPT_NAME')) {
$GLOBALS['target'] = basename(PMA_getenv('SCRIPT_NAME'));
// avoid "missing parameter: field" on re-entry
if ('tbl_alter.php' == $GLOBALS['target']) {
$GLOBALS['target'] = 'tbl_structure.php';
}
}
/**

2
libraries/relation.lib.php
View File

@ -1209,7 +1209,7 @@ function PMA_getRelatives($all_tables, $master)
/**
* Rename a field in relation tables
*
* usually called after a field in a table was renamed in tbl_alter.php
* usually called after a column in a table was renamed
*
* @param string $db databse name
* @param string $table table name

98
libraries/structure.lib.php
View File

@ -1432,7 +1432,7 @@ function PMA_getHtmlDivForMoveColumnsDialog()
$html_output .= '<p>'
. __('Move the columns by dragging them up and down.') . '</p>';
$html_output .= '<form action="tbl_alter.php">'
$html_output .= '<form action="tbl_structure.php">'
. '<div>'
. PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table'])
. '<ul></ul>'
@ -2274,7 +2274,7 @@ function PMA_displayHtmlForColumnChange($db, $table, $selected, $action)
$num_fields = count($fields_meta);
// set these globals because tbl_properties.inc.php verifies them
// @todo: refactor tbl_properties.inc.php so that it uses function params
$GLOBALS['action'] = 'tbl_alter.php';
$GLOBALS['action'] = 'tbl_structure.php';
$GLOBALS['num_fields'] = $num_fields;
// Get more complete field information.
@ -2451,4 +2451,98 @@ function PMA_updateColumns($db, $table)
return $regenerate;
}
/**
* Moves columns in the table's structure based on $_REQUEST
*
* @param string $db database name
* @param string $table table name
*/
function PMA_moveColumns($db, $table)
{
PMA_DBI_select_db($db);
/*
* load the definitions for all columns
*/
$columns = PMA_DBI_get_columns_full($db, $table);
$column_names = array_keys($columns);
$changes = array();
$we_dont_change_keys = array();
// move columns from first to last
for ($i = 0, $l = count($_REQUEST['move_columns']); $i < $l; $i++) {
$column = $_REQUEST['move_columns'][$i];
// is this column already correctly placed?
if ($column_names[$i] == $column) {
continue;
}
// it is not, let's move it to index $i
$data = $columns[$column];
$extracted_columnspec = PMA_Util::extractColumnSpec($data['Type']);
if (isset($data['Extra']) && $data['Extra'] == 'on update CURRENT_TIMESTAMP') {
$extracted_columnspec['attribute'] = $data['Extra'];
unset($data['Extra']);
}
$current_timestamp = false;
if ($data['Type'] == 'timestamp' && $data['Default'] == 'CURRENT_TIMESTAMP') {
$current_timestamp = true;
}
$default_type
= $data['Null'] === 'YES' && $data['Default'] === null
? 'NULL'
: ($current_timestamp
? 'CURRENT_TIMESTAMP'
: ($data['Default'] == ''
? 'NONE'
: 'USER_DEFINED'));
$changes[] = 'CHANGE ' . PMA_Table::generateAlter(
$column,
$column,
strtoupper($extracted_columnspec['type']),
$extracted_columnspec['spec_in_brackets'],
$extracted_columnspec['attribute'],
isset($data['Collation']) ? $data['Collation'] : '',
$data['Null'] === 'YES' ? 'NULL' : 'NOT NULL',
$default_type,
$current_timestamp ? '' : $data['Default'],
isset($data['Extra']) && $data['Extra'] !== '' ? $data['Extra'] : false,
isset($data['Comments']) && $data['Comments'] !== ''
? $data['Comments'] : false,
$we_dont_change_keys,
$i,
$i === 0 ? '-first' : $column_names[$i - 1]
);
// update current column_names array, first delete old position
for ($j = 0, $ll = count($column_names); $j < $ll; $j++) {
if ($column_names[$j] == $column) {
unset($column_names[$j]);
}
}
// insert moved column
array_splice($column_names, $i, 0, $column);
}
$response = PMA_Response::getInstance();
if (empty($changes)) { // should never happen
$response->isSuccess(false);
exit;
}
$move_query = 'ALTER TABLE ' . PMA_Util::backquote($table) . ' ';
$move_query .= implode(', ', $changes);
// move columns
$result = PMA_DBI_try_query($move_query);
$tmp_error = PMA_DBI_getError();
if ($tmp_error) {
$response->isSuccess(false);
$response->addJSON('message', PMA_Message::error($tmp_error));
} else {
$message = PMA_Message::success(
__('The columns have been moved successfully.')
);
$response->addJSON('message', $message);
$response->addJSON('columns', $column_names);
}
exit;
}
?>

128
tbl_alter.php
View File

@ -1,128 +0,0 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Alter one or more table columns
*
* linked from table_structure, uses libraries/tbl_properties.inc.php to display
* form and handles this form data
*
* @package PhpMyAdmin
*/
/**
* Gets some core libraries
*/
require_once 'libraries/common.inc.php';
if (isset($_REQUEST['field'])) {
$GLOBALS['field'] = $_REQUEST['field'];
}
// Check parameters
PMA_Util::checkParameters(array('db', 'table'));
/**
* Gets tables informations
*/
require_once 'libraries/tbl_common.inc.php';
require_once 'libraries/tbl_info.inc.php';
$active_page = 'tbl_structure.php';
/**
* Defines the url to return to in case of error in a sql statement
*/
$err_url = 'tbl_structure.php?' . PMA_generate_common_url($db, $table);
/**
* Moving columns
*/
if (isset($_REQUEST['move_columns'])
&& is_array($_REQUEST['move_columns'])
&& $GLOBALS['is_ajax_request']
) {
/*
* first, load the definitions for all columns
*/
$columns = PMA_DBI_get_columns_full($db, $table);
$column_names = array_keys($columns);
$changes = array();
$we_dont_change_keys = array();
// move columns from first to last
for ($i = 0, $l = count($_REQUEST['move_columns']); $i < $l; $i++) {
$column = $_REQUEST['move_columns'][$i];
// is this column already correctly placed?
if ($column_names[$i] == $column) {
continue;
}
// it is not, let's move it to index $i
$data = $columns[$column];
$extracted_columnspec = PMA_Util::extractColumnSpec($data['Type']);
if (isset($data['Extra']) && $data['Extra'] == 'on update CURRENT_TIMESTAMP') {
$extracted_columnspec['attribute'] = $data['Extra'];
unset($data['Extra']);
}
$current_timestamp = false;
if ($data['Type'] == 'timestamp' && $data['Default'] == 'CURRENT_TIMESTAMP') {
$current_timestamp = true;
}
$default_type
= $data['Null'] === 'YES' && $data['Default'] === null
? 'NULL'
: ($current_timestamp
? 'CURRENT_TIMESTAMP'
: ($data['Default'] == ''
? 'NONE'
: 'USER_DEFINED'));
$changes[] = 'CHANGE ' . PMA_Table::generateAlter(
$column,
$column,
strtoupper($extracted_columnspec['type']),
$extracted_columnspec['spec_in_brackets'],
$extracted_columnspec['attribute'],
isset($data['Collation']) ? $data['Collation'] : '',
$data['Null'] === 'YES' ? 'NULL' : 'NOT NULL',
$default_type,
$current_timestamp ? '' : $data['Default'],
isset($data['Extra']) && $data['Extra'] !== '' ? $data['Extra'] : false,
isset($data['Comments']) && $data['Comments'] !== ''
? $data['Comments'] : false,
$we_dont_change_keys,
$i,
$i === 0 ? '-first' : $column_names[$i - 1]
);
// update current column_names array, first delete old position
for ($j = 0, $ll = count($column_names); $j < $ll; $j++) {
if ($column_names[$j] == $column) {
unset($column_names[$j]);
}
}
// insert moved column
array_splice($column_names, $i, 0, $column);
}
$response = PMA_Response::getInstance();
if (empty($changes)) { // should never happen
$response->isSuccess(false);
exit;
}
$move_query = 'ALTER TABLE ' . PMA_Util::backquote($table) . ' ';
$move_query .= implode(', ', $changes);
// move columns
$result = PMA_DBI_try_query($move_query);
$tmp_error = PMA_DBI_getError();
if ($tmp_error) {
$response->isSuccess(false);
$response->addJSON('message', PMA_Message::error($tmp_error));
} else {
$message = PMA_Message::success(
__('The columns have been moved successfully.')
);
$response->addJSON('message', $message);
$response->addJSON('columns', $column_names);
}
exit;
}
?>

11
tbl_structure.php
View File

@ -24,6 +24,17 @@ $scripts = $header->getScripts();
$scripts->addFile('tbl_structure.js');
$scripts->addFile('indexes.js');
/**
* Handle column moving
*/
if (isset($_REQUEST['move_columns'])
&& is_array($_REQUEST['move_columns'])
&& $response->isAjax()
) {
PMA_moveColumns($db, $table);
exit;
}
/**
* A click on Change has been made for one column
*/

1
test/libraries/core/PMA_checkPageValidity_test.php
View File

@ -28,7 +28,6 @@ class PMA_checkPageValidity_test extends PHPUnit_Framework_TestCase
'server_binlog.php',
'server_variables.php',
'sql.php',
'tbl_alter.php',
'tbl_select.php',
'transformation_overview.php',
'transformation_wrapper.php',