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

Merge pull request #13598 from mauriciofauth/operations

Browse Source 
Refactor operations functions to static methods
This commit is contained in:
Maurício Meneghini Fauth 2017-08-20 21:52:44 -03:00 committed by GitHub
commit 77c7fda07b
8 changed files with 2277 additions and 2267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
db_operations.php
View File

@ -11,8 +11,12 @@
*
* @package PhpMyAdmin
*/
use PhpMyAdmin\Response;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Message;
use PhpMyAdmin\Plugins\Export\ExportSql;
use PhpMyAdmin\Operations;
use PhpMyAdmin\Response;
use PhpMyAdmin\Util;
/**
* requirements
@ -24,7 +28,6 @@ require_once 'libraries/display_create_table.lib.php';
* functions implementation for this script
*/
require_once 'libraries/check_user_privileges.lib.php';
require_once 'libraries/operations.lib.php';
// add a javascript file for jQuery functions to handle Ajax actions
$response = Response::getInstance();
@ -47,15 +50,15 @@ if (strlen($GLOBALS['db']) > 0
}
if (! isset($_REQUEST['newname']) || strlen($_REQUEST['newname']) === 0) {
$message = PhpMyAdmin\Message::error(__('The database name is empty!'));
$message = Message::error(__('The database name is empty!'));
} else if($_REQUEST['newname'] === $_REQUEST['db']) {
$message = PhpMyAdmin\Message::error(
$message = Message::error(
__('Cannot copy database to the same name. Change the name and try again.')
);
} else {
$_error = false;
if ($move || ! empty($_REQUEST['create_database_before_copying'])) {
PMA_createDbBeforeCopy();
Operations::createDbBeforeCopy();
}
// here I don't use DELIMITER because it's not part of the
@ -64,7 +67,7 @@ if (strlen($GLOBALS['db']) > 0
// to avoid selecting alternatively the current and new db
// we would need to modify the CREATE definitions to qualify
// the db name
PMA_runProcedureAndFunctionDefinitions($GLOBALS['db']);
Operations::runProcedureAndFunctionDefinitions($GLOBALS['db']);
// go back to current db, just in case
$GLOBALS['dbi']->selectDb($GLOBALS['db']);
@ -85,24 +88,24 @@ if (strlen($GLOBALS['db']) > 0
);
// create stand-in tables for views
$views = PMA_getViewsAndCreateSqlViewStandIn(
$views = Operations::getViewsAndCreateSqlViewStandIn(
$tables_full, $export_sql_plugin, $GLOBALS['db']
);
// copy tables
$sqlConstratints = PMA_copyTables(
$sqlConstratints = Operations::copyTables(
$tables_full, $move, $GLOBALS['db']
);
// handle the views
if (! $_error) {
PMA_handleTheViews($views, $move, $GLOBALS['db']);
Operations::handleTheViews($views, $move, $GLOBALS['db']);
}
unset($views);
// now that all tables exist, create all the accumulated constraints
if (! $_error && count($sqlConstratints) > 0) {
PMA_createAllAccumulatedConstraints($sqlConstratints);
Operations::createAllAccumulatedConstraints($sqlConstratints);
}
unset($sqlConstratints);
@ -110,20 +113,20 @@ if (strlen($GLOBALS['db']) > 0
// here DELIMITER is not used because it's not part of the
// language; each statement is sent one by one
PMA_runEventDefinitionsForDb($GLOBALS['db']);
Operations::runEventDefinitionsForDb($GLOBALS['db']);
}
// go back to current db, just in case
$GLOBALS['dbi']->selectDb($GLOBALS['db']);
// Duplicate the bookmarks for this db (done once for each db)
PMA_duplicateBookmarks($_error, $GLOBALS['db']);
Operations::duplicateBookmarks($_error, $GLOBALS['db']);
if (! $_error && $move) {
if (isset($_REQUEST['adjust_privileges'])
&& ! empty($_REQUEST['adjust_privileges'])
) {
PMA_AdjustPrivileges_moveDB($GLOBALS['db'], $_REQUEST['newname']);
Operations::adjustPrivilegesMoveDb($GLOBALS['db'], $_REQUEST['newname']);
}
/**
@ -134,11 +137,11 @@ if (strlen($GLOBALS['db']) > 0
// if someday the RENAME DATABASE reappears, do not DROP
$local_query = 'DROP DATABASE '
. PhpMyAdmin\Util::backquote($GLOBALS['db']) . ';';
. Util::backquote($GLOBALS['db']) . ';';
$sql_query .= "\n" . $local_query;
$GLOBALS['dbi']->query($local_query);
$message = PhpMyAdmin\Message::success(
$message = Message::success(
__('Database %1$s has been renamed to %2$s.')
);
$message->addParam($GLOBALS['db']);
@ -147,16 +150,16 @@ if (strlen($GLOBALS['db']) > 0
if (isset($_REQUEST['adjust_privileges'])
&& ! empty($_REQUEST['adjust_privileges'])
) {
PMA_AdjustPrivileges_copyDB($GLOBALS['db'], $_REQUEST['newname']);
Operations::adjustPrivilegesCopyDb($GLOBALS['db'], $_REQUEST['newname']);
}
$message = PhpMyAdmin\Message::success(
$message = Message::success(
__('Database %1$s has been copied to %2$s.')
);
$message->addParam($GLOBALS['db']);
$message->addParam($_REQUEST['newname']);
} else {
$message = PhpMyAdmin\Message::error();
$message = Message::error();
}
$reload = true;
@ -185,7 +188,7 @@ if (strlen($GLOBALS['db']) > 0
$response->addJSON('newname', $_REQUEST['newname']);
$response->addJSON(
'sql_query',
PhpMyAdmin\Util::getMessage(null, $sql_query)
Util::getMessage(null, $sql_query)
);
$response->addJSON('db', $GLOBALS['db']);
exit;
@ -222,12 +225,12 @@ list(
$tooltip_truename,
$tooltip_aliasname,
$pos
) = PhpMyAdmin\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
) = Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
echo "\n";
if (isset($message)) {
echo PhpMyAdmin\Util::getMessage($message, $sql_query);
echo Util::getMessage($message, $sql_query);
unset($message);
}
@ -239,7 +242,7 @@ if (!$is_information_schema) {
/**
* database comment
*/
$response->addHTML(PMA_getHtmlForDatabaseComment($GLOBALS['db']));
$response->addHTML(Operations::getHtmlForDatabaseComment($GLOBALS['db']));
}
$response->addHTML('<div>');
@ -250,7 +253,7 @@ if (!$is_information_schema) {
* rename database
*/
if ($GLOBALS['db'] != 'mysql') {
$response->addHTML(PMA_getHtmlForRenameDatabase($GLOBALS['db']));
$response->addHTML(Operations::getHtmlForRenameDatabase($GLOBALS['db']));
}
// Drop link if allowed
@ -261,22 +264,22 @@ if (!$is_information_schema) {
&& ! $db_is_system_schema
&& $GLOBALS['db'] != 'mysql'
) {
$response->addHTML(PMA_getHtmlForDropDatabaseLink($GLOBALS['db']));
$response->addHTML(Operations::getHtmlForDropDatabaseLink($GLOBALS['db']));
}
/**
* Copy database
*/
$response->addHTML(PMA_getHtmlForCopyDatabase($GLOBALS['db']));
$response->addHTML(Operations::getHtmlForCopyDatabase($GLOBALS['db']));
/**
* Change database charset
*/
$response->addHTML(PMA_getHtmlForChangeDatabaseCharset($GLOBALS['db'], $table));
$response->addHTML(Operations::getHtmlForChangeDatabaseCharset($GLOBALS['db'], $table));
if (! $cfgRelation['allworks']
&& $cfg['PmaNoRelation_DisableWarning'] == false
) {
$message = PhpMyAdmin\Message::notice(
$message = Message::notice(
__(
'The phpMyAdmin configuration storage has been deactivated. ' .
'%sFind out why%s.'
@ -296,13 +299,13 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) {
// We only show this if we find something in the new pdf_pages table
$test_query = '
SELECT *
FROM ' . PhpMyAdmin\Util::backquote($GLOBALS['cfgRelation']['db'])
. '.' . PhpMyAdmin\Util::backquote($cfgRelation['pdf_pages']) . '
FROM ' . Util::backquote($GLOBALS['cfgRelation']['db'])
. '.' . Util::backquote($cfgRelation['pdf_pages']) . '
WHERE db_name = \'' . $GLOBALS['dbi']->escapeString($GLOBALS['db'])
. '\'';
$test_rs = PMA_queryAsControlUser(
$test_query,
false,
PhpMyAdmin\DatabaseInterface::QUERY_STORE
DatabaseInterface::QUERY_STORE
);
} // end if

2131
libraries/classes/Operations.php Normal file
View File

File diff suppressed because it is too large Load Diff

7
libraries/classes/Sql.php
View File

@ -13,6 +13,7 @@ use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\DisplayResults;
use PhpMyAdmin\Index;
use PhpMyAdmin\Message;
use PhpMyAdmin\Operations;
use PhpMyAdmin\Response;
use PhpMyAdmin\SqlParser\Statements\AlterStatement;
use PhpMyAdmin\SqlParser\Statements\DropStatement;
@ -23,8 +24,6 @@ use PhpMyAdmin\Transformations;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
require_once 'libraries/operations.lib.php';
/**
* Sql class
*
@ -2183,7 +2182,7 @@ EOT;
isset($extra_data) ? $extra_data : null
);
$warning_messages = PMA_getWarningMessagesArray();
$warning_messages = Operations::getWarningMessagesArray();
// No rows returned -> move back to the calling page
if ((0 == $num_rows && 0 == $unlim_num_rows)
@ -2223,7 +2222,7 @@ EOT;
Util::handleDisableFKCheckCleanup($default_fk_check);
foreach ($warning_messages as $warning) {
$message = \PhpMyAdmin\Message::notice($warning);
$message = Message::notice($warning);
$html_output .= $message->getDisplay();
}

79
libraries/mult_submits.lib.php
View File

@ -8,10 +8,12 @@
* @package PhpMyAdmin
*/
use PhpMyAdmin\Operations;
use PhpMyAdmin\Sql;
use PhpMyAdmin\Table;
use PhpMyAdmin\Transformations;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
/**
* Gets url params
@ -47,7 +49,7 @@ function PMA_getUrlParams(
foreach ($selected as $sval) {
if ($what == 'row_delete') {
$_url_params['selected'][] = 'DELETE FROM '
. PhpMyAdmin\Util::backquote($table)
. Util::backquote($table)
. ' WHERE ' . $sval . ' LIMIT 1;';
} else {
$_url_params['selected'][] = $sval;
@ -116,7 +118,7 @@ function PMA_buildOrExecuteQueryForMulti(
case 'drop_db':
PMA_relationsCleanupDatabase($selected[$i]);
$a_query = 'DROP DATABASE '
. PhpMyAdmin\Util::backquote($selected[$i]);
. Util::backquote($selected[$i]);
$reload = 1;
$run_parts = true;
$rebuild_database_list = true;
@ -127,104 +129,104 @@ function PMA_buildOrExecuteQueryForMulti(
$current = $selected[$i];
if (!empty($views) && in_array($current, $views)) {
$sql_query_views .= (empty($sql_query_views) ? 'DROP VIEW ' : ', ')
. PhpMyAdmin\Util::backquote($current);
. Util::backquote($current);
} else {
$sql_query .= (empty($sql_query) ? 'DROP TABLE ' : ', ')
. PhpMyAdmin\Util::backquote($current);
. Util::backquote($current);
}
$reload = 1;
break;
case 'check_tbl':
$sql_query .= (empty($sql_query) ? 'CHECK TABLE ' : ', ')
. PhpMyAdmin\Util::backquote($selected[$i]);
. Util::backquote($selected[$i]);
$execute_query_later = true;
break;
case 'optimize_tbl':
$sql_query .= (empty($sql_query) ? 'OPTIMIZE TABLE ' : ', ')
. PhpMyAdmin\Util::backquote($selected[$i]);
. Util::backquote($selected[$i]);
$execute_query_later = true;
break;
case 'analyze_tbl':
$sql_query .= (empty($sql_query) ? 'ANALYZE TABLE ' : ', ')
. PhpMyAdmin\Util::backquote($selected[$i]);
. Util::backquote($selected[$i]);
$execute_query_later = true;
break;
case 'checksum_tbl':
$sql_query .= (empty($sql_query) ? 'CHECKSUM TABLE ' : ', ')
. PhpMyAdmin\Util::backquote($selected[$i]);
. Util::backquote($selected[$i]);
$execute_query_later = true;
break;
case 'repair_tbl':
$sql_query .= (empty($sql_query) ? 'REPAIR TABLE ' : ', ')
. PhpMyAdmin\Util::backquote($selected[$i]);
. Util::backquote($selected[$i]);
$execute_query_later = true;
break;
case 'empty_tbl':
$deletes = true;
$a_query = 'TRUNCATE ';
$a_query .= PhpMyAdmin\Util::backquote($selected[$i]);
$a_query .= Util::backquote($selected[$i]);
$run_parts = true;
break;
case 'drop_fld':
PMA_relationsCleanupColumn($db, $table, $selected[$i]);
$sql_query .= (empty($sql_query)
? 'ALTER TABLE ' . PhpMyAdmin\Util::backquote($table)
? 'ALTER TABLE ' . Util::backquote($table)
: ',')
. ' DROP ' . PhpMyAdmin\Util::backquote($selected[$i])
. ' DROP ' . Util::backquote($selected[$i])
. (($i == $selected_cnt-1) ? ';' : '');
break;
case 'primary_fld':
$sql_query .= (empty($sql_query)
? 'ALTER TABLE ' . PhpMyAdmin\Util::backquote($table)
? 'ALTER TABLE ' . Util::backquote($table)
. (empty($primary)
? ''
: ' DROP PRIMARY KEY,') . ' ADD PRIMARY KEY( '
: ', ')
. PhpMyAdmin\Util::backquote($selected[$i])
. Util::backquote($selected[$i])
. (($i == $selected_cnt-1) ? ');' : '');
break;
case 'index_fld':
$sql_query .= (empty($sql_query)
? 'ALTER TABLE ' . PhpMyAdmin\Util::backquote($table)
? 'ALTER TABLE ' . Util::backquote($table)
. ' ADD INDEX( '
: ', ')
. PhpMyAdmin\Util::backquote($selected[$i])
. Util::backquote($selected[$i])
. (($i == $selected_cnt-1) ? ');' : '');
break;
case 'unique_fld':
$sql_query .= (empty($sql_query)
? 'ALTER TABLE ' . PhpMyAdmin\Util::backquote($table)
? 'ALTER TABLE ' . Util::backquote($table)
. ' ADD UNIQUE( '
: ', ')
. PhpMyAdmin\Util::backquote($selected[$i])
. Util::backquote($selected[$i])
. (($i == $selected_cnt-1) ? ');' : '');
break;
case 'spatial_fld':
$sql_query .= (empty($sql_query)
? 'ALTER TABLE ' . PhpMyAdmin\Util::backquote($table)
? 'ALTER TABLE ' . Util::backquote($table)
. ' ADD SPATIAL( '
: ', ')
. PhpMyAdmin\Util::backquote($selected[$i])
. Util::backquote($selected[$i])
. (($i == $selected_cnt-1) ? ');' : '');
break;
case 'fulltext_fld':
$sql_query .= (empty($sql_query)
? 'ALTER TABLE ' . PhpMyAdmin\Util::backquote($table)
? 'ALTER TABLE ' . Util::backquote($table)
. ' ADD FULLTEXT( '
: ', ')
. PhpMyAdmin\Util::backquote($selected[$i])
. Util::backquote($selected[$i])
. (($i == $selected_cnt-1) ? ');' : '');
break;
@ -232,9 +234,9 @@ function PMA_buildOrExecuteQueryForMulti(
$newtablename = $_POST['add_prefix'] . $selected[$i];
// ADD PREFIX TO TABLE NAME
$a_query = 'ALTER TABLE '
. PhpMyAdmin\Util::backquote($selected[$i])
. Util::backquote($selected[$i])
. ' RENAME '
. PhpMyAdmin\Util::backquote($newtablename);
. Util::backquote($newtablename);
$run_parts = true;
break;
@ -256,9 +258,9 @@ function PMA_buildOrExecuteQueryForMulti(
}
// CHANGE PREFIX PATTERN
$a_query = 'ALTER TABLE '
. PhpMyAdmin\Util::backquote($selected[$i])
. Util::backquote($selected[$i])
. ' RENAME '
. PhpMyAdmin\Util::backquote($newtablename);
. Util::backquote($newtablename);
$run_parts = true;
break;
@ -282,8 +284,7 @@ function PMA_buildOrExecuteQueryForMulti(
$copy_tbl = true;
Table::moveCopy($db, $selected[$i], $_POST['target_db'], $selected[$i], $_POST['what'], false, 'one_table');
if (isset($_POST['adjust_privileges']) && !empty($_POST['adjust_privileges'])) {
include_once 'operations.lib.php';
PMA_AdjustPrivileges_copyTable($db, $selected[$i], $_POST['target_db'], $selected[$i]);
Operations::adjustPrivilegesCopyTable($db, $selected[$i], $_POST['target_db'], $selected[$i]);
}
break;
} // end switch
@ -454,7 +455,7 @@ function PMA_getHtmlForOtherActions($what, $action, $_url_params, $full_query)
// Display option to disable foreign key checks while dropping tables
if ($what === 'drop_tbl' || $what === 'empty_tbl' || $what === 'row_delete') {
$html .= '<div id="foreignkeychk">';
$html .= PhpMyAdmin\Util::getFKCheckbox();
$html .= Util::getFKCheckbox();
$html .= '</div>';
}
$html .= '<input id="buttonYes" type="submit" name="mult_btn" value="'
@ -493,7 +494,7 @@ function PMA_getQueryFromSelected($what, $table, $selected, $views)
switch ($what) {
case 'row_delete':
$full_query .= 'DELETE FROM '
. PhpMyAdmin\Util::backquote(htmlspecialchars($table))
. Util::backquote(htmlspecialchars($table))
// Do not append a "LIMIT 1" clause here
// (it's not binlog friendly).
// We don't need the clause because the calling panel permits
@ -503,7 +504,7 @@ function PMA_getQueryFromSelected($what, $table, $selected, $views)
break;
case 'drop_db':
$full_query .= 'DROP DATABASE '
. PhpMyAdmin\Util::backquote(htmlspecialchars($sval))
. Util::backquote(htmlspecialchars($sval))
. ';<br />';
$reload = true;
break;
@ -512,31 +513,31 @@ function PMA_getQueryFromSelected($what, $table, $selected, $views)
$current = $sval;
if (!empty($views) && in_array($current, $views)) {
$full_query_views .= (empty($full_query_views) ? 'DROP VIEW ' : ', ')
. PhpMyAdmin\Util::backquote(htmlspecialchars($current));
. Util::backquote(htmlspecialchars($current));
} else {
$full_query .= (empty($full_query) ? 'DROP TABLE ' : ', ')
. PhpMyAdmin\Util::backquote(htmlspecialchars($current));
. Util::backquote(htmlspecialchars($current));
}
break;
case 'empty_tbl':
$full_query .= 'TRUNCATE ';
$full_query .= PhpMyAdmin\Util::backquote(htmlspecialchars($sval))
$full_query .= Util::backquote(htmlspecialchars($sval))
. ';<br />';
break;
case 'primary_fld':
if ($full_query == '') {
$full_query .= 'ALTER TABLE '
. PhpMyAdmin\Util::backquote(htmlspecialchars($table))
. Util::backquote(htmlspecialchars($table))
. '<br />&nbsp;&nbsp;DROP PRIMARY KEY,'
. '<br />&nbsp;&nbsp; ADD PRIMARY KEY('
. '<br />&nbsp;&nbsp;&nbsp;&nbsp; '
. PhpMyAdmin\Util::backquote(htmlspecialchars($sval))
. Util::backquote(htmlspecialchars($sval))
. ',';
} else {
$full_query .= '<br />&nbsp;&nbsp;&nbsp;&nbsp; '
. PhpMyAdmin\Util::backquote(htmlspecialchars($sval))
. Util::backquote(htmlspecialchars($sval))
. ',';
}
if ($i == $selected_cnt-1) {
@ -547,10 +548,10 @@ function PMA_getQueryFromSelected($what, $table, $selected, $views)
case 'drop_fld':
if ($full_query == '') {
$full_query .= 'ALTER TABLE '
. PhpMyAdmin\Util::backquote(htmlspecialchars($table));
. Util::backquote(htmlspecialchars($table));
}
$full_query .= '<br />&nbsp;&nbsp;DROP '
. PhpMyAdmin\Util::backquote(htmlspecialchars($sval))
. Util::backquote(htmlspecialchars($sval))
. ',';
if ($i == $selected_cnt - 1) {
$full_query = preg_replace('@,$@', ';<br />', $full_query);

2121
libraries/operations.lib.php
View File

File diff suppressed because it is too large Load Diff

63
tbl_operations.php
View File

@ -5,9 +5,13 @@
*
* @package PhpMyAdmin
*/
use PhpMyAdmin\Index;
use PhpMyAdmin\Message;
use PhpMyAdmin\Partition;
use PhpMyAdmin\Table;
use PhpMyAdmin\Operations;
use PhpMyAdmin\Response;
use PhpMyAdmin\Table;
use PhpMyAdmin\Util;
/**
*
@ -18,7 +22,6 @@ require_once 'libraries/common.inc.php';
* functions implementation for this script
*/
require_once 'libraries/check_user_privileges.lib.php';
require_once 'libraries/operations.lib.php';
$pma_table = new Table($GLOBALS['table'], $GLOBALS['db']);
@ -95,7 +98,7 @@ $table_alters = array();
*/
if (isset($_REQUEST['submit_move']) || isset($_REQUEST['submit_copy'])) {
//$_message = '';
PMA_moveOrCopyTable($db, $table);
Operations::moveOrCopyTable($db, $table);
// This was ended in an Ajax call
exit;
}
@ -122,7 +125,7 @@ if (isset($_REQUEST['submitoptions'])) {
if (isset($_REQUEST['adjust_privileges'])
&& ! empty($_REQUEST['adjust_privileges'])
) {
PMA_AdjustPrivileges_renameOrMoveTable(
Operations::adjustPrivilegesRenameOrMoveTable(
$oldDb, $oldTable, $_REQUEST['db'], $_REQUEST['new_name']
);
}
@ -160,7 +163,7 @@ if (isset($_REQUEST['submitoptions'])) {
? $create_options['row_format']
: $pma_table->getRowFormat();
$table_alters = PMA_getTableAltersArray(
$table_alters = Operations::getTableAltersArray(
$pma_table,
$create_options['pack_keys'],
(empty($create_options['checksum']) ? '0' : '1'),
@ -174,13 +177,13 @@ if (isset($_REQUEST['submitoptions'])) {
if (count($table_alters) > 0) {
$sql_query = 'ALTER TABLE '
. PhpMyAdmin\Util::backquote($GLOBALS['table']);
. Util::backquote($GLOBALS['table']);
$sql_query .= "\r\n" . implode("\r\n", $table_alters);
$sql_query .= ';';
$result .= $GLOBALS['dbi']->query($sql_query) ? true : false;
$reread_info = true;
unset($table_alters);
$warning_messages = PMA_getWarningMessagesArray();
$warning_messages = Operations::getWarningMessagesArray();
}
if (isset($_REQUEST['tbl_collation'])
@ -188,7 +191,7 @@ if (isset($_REQUEST['submitoptions'])) {
&& isset($_REQUEST['change_all_collations'])
&& ! empty($_REQUEST['change_all_collations'])
) {
PMA_changeAllColumnsCollation(
Operations::changeAllColumnsCollation(
$GLOBALS['db'], $GLOBALS['table'], $_REQUEST['tbl_collation']
);
}
@ -197,7 +200,7 @@ if (isset($_REQUEST['submitoptions'])) {
* Reordering the table has been requested by the user
*/
if (isset($_REQUEST['submitorderby']) && ! empty($_REQUEST['order_field'])) {
list($sql_query, $result) = PMA_getQueryAndResultForReorderingTable();
list($sql_query, $result) = Operations::getQueryAndResultForReorderingTable();
} // end if
/**
@ -206,7 +209,7 @@ if (isset($_REQUEST['submitorderby']) && ! empty($_REQUEST['order_field'])) {
if (isset($_REQUEST['submit_partition'])
&& ! empty($_REQUEST['partition_operation'])
) {
list($sql_query, $result) = PMA_getQueryAndResultForPartition();
list($sql_query, $result) = Operations::getQueryAndResultForPartition();
} // end if
if ($reread_info) {
@ -235,11 +238,11 @@ unset($reread_info);
if (isset($result) && empty($message_to_show)) {
if (empty($_message)) {
if (empty($sql_query)) {
$_message = PhpMyAdmin\Message::success(__('No change'));
$_message = Message::success(__('No change'));
} else {
$_message = $result
? PhpMyAdmin\Message::success()
: PhpMyAdmin\Message::error();
? Message::success()
: Message::error();
}
if ($response->isAjax()) {
@ -247,19 +250,19 @@ if (isset($result) && empty($message_to_show)) {
$response->addJSON('message', $_message);
if (!empty($sql_query)) {
$response->addJSON(
'sql_query', PhpMyAdmin\Util::getMessage(null, $sql_query)
'sql_query', Util::getMessage(null, $sql_query)
);
}
exit;
}
} else {
$_message = $result
? PhpMyAdmin\Message::success($_message)
: PhpMyAdmin\Message::error($_message);
? Message::success($_message)
: Message::error($_message);
}
if (! empty($warning_messages)) {
$_message = new PhpMyAdmin\Message;
$_message = new Message;
$_message->addMessagesString($warning_messages);
$_message->isError(true);
if ($response->isAjax()) {
@ -267,7 +270,7 @@ if (isset($result) && empty($message_to_show)) {
$response->addJSON('message', $_message);
if (!empty($sql_query)) {
$response->addJSON(
'sql_query', PhpMyAdmin\Util::getMessage(null, $sql_query)
'sql_query', Util::getMessage(null, $sql_query)
);
}
exit;
@ -281,7 +284,7 @@ if (isset($result) && empty($message_to_show)) {
);
} else {
$response->addHTML(
PhpMyAdmin\Util::getMessage($_message, $sql_query)
Util::getMessage($_message, $sql_query)
);
}
unset($_message);
@ -308,7 +311,7 @@ $hideOrderTable = false;
// a user-defined clustered index (PRIMARY KEY or NOT NULL UNIQUE index).
// InnoDB always orders table rows according to such an index if one is present.
if ($tbl_storage_engine == 'INNODB') {
$indexes = PhpMyAdmin\Index::getFromTable($GLOBALS['table'], $GLOBALS['db']);
$indexes = Index::getFromTable($GLOBALS['table'], $GLOBALS['db']);
foreach ($indexes as $name => $idx) {
if ($name == 'PRIMARY') {
$hideOrderTable = true;
@ -329,13 +332,13 @@ if ($tbl_storage_engine == 'INNODB') {
}
}
if (! $hideOrderTable) {
$response->addHTML(PMA_getHtmlForOrderTheTable($columns));
$response->addHTML(Operations::getHtmlForOrderTheTable($columns));
}
/**
* Move table
*/
$response->addHTML(PMA_getHtmlForMoveTable());
$response->addHTML(Operations::getHtmlForMoveTable());
if (mb_strstr($show_comment, '; InnoDB free') === false) {
if (mb_strstr($show_comment, 'InnoDB free') === false) {
@ -359,7 +362,7 @@ if (mb_strstr($show_comment, '; InnoDB free') === false) {
// check for version
$response->addHTML(
PMA_getTableOptionDiv(
Operations::getTableOptionDiv(
$pma_table, $comment, $tbl_collation, $tbl_storage_engine,
$create_options['pack_keys'],
$auto_increment,
@ -373,13 +376,13 @@ $response->addHTML(
/**
* Copy table
*/
$response->addHTML(PMA_getHtmlForCopytable());
$response->addHTML(Operations::getHtmlForCopytable());
/**
* Table maintenance
*/
$response->addHTML(
PMA_getHtmlForTableMaintenance($pma_table, $url_params)
Operations::getHtmlForTableMaintenance($pma_table, $url_params)
);
if (! (isset($db_is_system_schema) && $db_is_system_schema)) {
@ -390,7 +393,7 @@ if (! (isset($db_is_system_schema) && $db_is_system_schema)) {
&& ! (isset($db_is_system_schema) && $db_is_system_schema)
) {
$this_sql_query = 'TRUNCATE TABLE '
. PhpMyAdmin\Util::backquote($GLOBALS['table']);
. Util::backquote($GLOBALS['table']);
$truncate_table_url_params = array_merge(
$url_params,
array(
@ -406,7 +409,7 @@ if (! (isset($db_is_system_schema) && $db_is_system_schema)) {
}
if (! (isset($db_is_system_schema) && $db_is_system_schema)) {
$this_sql_query = 'DROP TABLE '
. PhpMyAdmin\Util::backquote($GLOBALS['table']);
. Util::backquote($GLOBALS['table']);
$drop_table_url_params = array_merge(
$url_params,
array(
@ -428,7 +431,7 @@ if (! (isset($db_is_system_schema) && $db_is_system_schema)) {
);
}
$response->addHTML(
PMA_getHtmlForDeleteDataOrTable(
Operations::getHtmlForDeleteDataOrTable(
$truncate_table_url_params,
$drop_table_url_params
)
@ -440,7 +443,7 @@ if (Partition::havePartitioning()) {
// show the Partition maintenance section only if we detect a partition
if (! is_null($partition_names[0])) {
$response->addHTML(
PMA_getHtmlForPartitionMaintenance($partition_names, $url_params)
Operations::getHtmlForPartitionMaintenance($partition_names, $url_params)
);
} // end if
} // end if
@ -458,7 +461,7 @@ if ($cfgRelation['relwork'] && ! $pma_table->isEngine("INNODB")) {
if (! empty($foreign)) {
$response->addHTML(
PMA_getHtmlForReferentialIntegrityCheck($foreign, $url_params)
Operations::getHtmlForReferentialIntegrityCheck($foreign, $url_params)
);
} // end if ($foreign)

60
test/libraries/PMA_operations_test.php → test/classes/OperationsTest.php
View File

@ -5,17 +5,12 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests;
/*
* Include to test.
*/
use PhpMyAdmin\Operations;
use PhpMyAdmin\Theme;
$GLOBALS['server'] = 1;
require_once 'libraries/operations.lib.php';
require_once 'libraries/relation.lib.php';
require_once 'libraries/database_interface.inc.php';
/**
@ -23,7 +18,7 @@ require_once 'libraries/database_interface.inc.php';
*
* @package PhpMyAdmin-test
*/
class PMA_Operations_Test extends PHPUnit_Framework_TestCase
class OperationsTest extends \PHPUnit_Framework_TestCase
{
/**
* Set up global environment.
@ -32,6 +27,7 @@ class PMA_Operations_Test extends PHPUnit_Framework_TestCase
*/
public function setup()
{
$GLOBALS['server'] = 1;
$GLOBALS['table'] = 'table';
$GLOBALS['db'] = 'db';
$GLOBALS['cfg'] = array(
@ -49,7 +45,7 @@ class PMA_Operations_Test extends PHPUnit_Framework_TestCase
}
/**
* Test for PMA_getHtmlForDatabaseComment
* Test for Operations::getHtmlForDatabaseComment
*
* @return void
*/
@ -58,12 +54,12 @@ class PMA_Operations_Test extends PHPUnit_Framework_TestCase
$this->assertRegExp(
'/.*db_operations.php(.|[\n])*Database comment.*name="comment"([\n]|.)*/m',
PMA_getHtmlForDatabaseComment("pma")
Operations::getHtmlForDatabaseComment("pma")
);
}
/**
* Test for PMA_getHtmlForRenameDatabase
* Test for Operations::getHtmlForRenameDatabase
*
* @return void
*/
@ -71,7 +67,7 @@ class PMA_Operations_Test extends PHPUnit_Framework_TestCase
{
$_REQUEST['db_collation'] = 'db1';
$html = PMA_getHtmlForRenameDatabase("pma");
$html = Operations::getHtmlForRenameDatabase("pma");
$this->assertContains('db_operations.php', $html);
$this->assertRegExp(
'/.*db_rename.*Rename database to.*/',
@ -80,7 +76,7 @@ class PMA_Operations_Test extends PHPUnit_Framework_TestCase
}
/**
* Test for PMA_getHtmlForDropDatabaseLink
* Test for Operations::getHtmlForDropDatabaseLink
*
* @return void
*/
@ -89,26 +85,26 @@ class PMA_Operations_Test extends PHPUnit_Framework_TestCase
$this->assertRegExp(
'/.*DROP.DATABASE.*db_operations.php.*Drop the database.*/',
PMA_getHtmlForDropDatabaseLink("pma")
Operations::getHtmlForDropDatabaseLink("pma")
);
}
/**
* Test for PMA_getHtmlForCopyDatabase
* Test for Operations::getHtmlForCopyDatabase
*
* @return void
*/
public function testGetHtmlForCopyDatabase()
{
$_REQUEST['db_collation'] = 'db1';
$html = PMA_getHtmlForCopyDatabase("pma");
$html = Operations::getHtmlForCopyDatabase("pma");
$this->assertRegExp('/.*db_operations.php.*/', $html);
$this->assertRegExp('/.*db_copy.*/', $html);
$this->assertRegExp('/.*Copy database to.*/', $html);
}
/**
* Test for PMA_getHtmlForChangeDatabaseCharset
* Test for Operations::getHtmlForChangeDatabaseCharset
*
* @return void
*/
@ -116,7 +112,7 @@ class PMA_Operations_Test extends PHPUnit_Framework_TestCase
{
$_REQUEST['db_collation'] = 'db1';
$result = PMA_getHtmlForChangeDatabaseCharset("pma", "bookmark");
$result = Operations::getHtmlForChangeDatabaseCharset("pma", "bookmark");
$this->assertRegExp(
'/.*select_db_collation.*Collation.*/m', $result
);
@ -126,7 +122,7 @@ class PMA_Operations_Test extends PHPUnit_Framework_TestCase
}
/**
* Test for PMA_getHtmlForOrderTheTable
* Test for Operations::getHtmlForOrderTheTable
*
* @return void
*/
@ -135,14 +131,14 @@ class PMA_Operations_Test extends PHPUnit_Framework_TestCase
$this->assertRegExp(
'/.*tbl_operations.php(.|[\n])*Alter table order by([\n]|.)*order_order.*/m',
PMA_getHtmlForOrderTheTable(
Operations::getHtmlForOrderTheTable(
array(array('Field' => "column1"), array('Field' => "column2"))
)
);
}
/**
* Test for PMA_getHtmlForTableRow
* Test for Operations::getHtmlForTableRow
*
* @return void
*/
@ -151,12 +147,12 @@ class PMA_Operations_Test extends PHPUnit_Framework_TestCase
$this->assertEquals(
'<tr><td class="vmiddle"><label for="name">lable</label></td><td><input type="checkbox" name="name" id="name" value="1"/></td></tr>',
PMA_getHtmlForTableRow("name", "lable", "value")
Operations::getHtmlForTableRow("name", "lable", "value")
);
}
/**
* Test for PMA_getMaintainActionlink
* Test for Operations::getMaintainActionlink
*
* @return void
*/
@ -165,7 +161,7 @@ class PMA_Operations_Test extends PHPUnit_Framework_TestCase
$this->assertRegExp(
'/.*href="sql.php.*post.*/',
PMA_getMaintainActionlink(
Operations::getMaintainActionlink(
"post",
array("name" => 'foo', "value" => 'bar'),
array(),
@ -175,7 +171,7 @@ class PMA_Operations_Test extends PHPUnit_Framework_TestCase
}
/**
* Test for PMA_getHtmlForDeleteDataOrTable
* Test for Operations::getHtmlForDeleteDataOrTable
*
* @return void
*/
@ -184,14 +180,14 @@ class PMA_Operations_Test extends PHPUnit_Framework_TestCase
$this->assertRegExp(
'/.*Delete data or table.*Empty the table.*Delete the table.*/m',
PMA_getHtmlForDeleteDataOrTable(
Operations::getHtmlForDeleteDataOrTable(
array("truncate" => 'foo'), array("drop" => 'bar')
)
);
}
/**
* Test for PMA_getDeleteDataOrTablelink
* Test for Operations::getDeleteDataOrTablelink
*
* @return void
*/
@ -200,7 +196,7 @@ class PMA_Operations_Test extends PHPUnit_Framework_TestCase
$this->assertRegExp(
'/.*TRUNCATE.TABLE.foo.*id_truncate.*Truncate table.*/m',
PMA_getDeleteDataOrTablelink(
Operations::getDeleteDataOrTablelink(
array("sql" => 'TRUNCATE TABLE foo'),
"TRUNCATE_TABLE",
"Truncate table",
@ -210,13 +206,13 @@ class PMA_Operations_Test extends PHPUnit_Framework_TestCase
}
/**
* Test for PMA_getHtmlForPartitionMaintenance
* Test for Operations::getHtmlForPartitionMaintenance
*
* @return void
*/
public function testGetHtmlForPartitionMaintenance()
{
$html = PMA_getHtmlForPartitionMaintenance(
$html = Operations::getHtmlForPartitionMaintenance(
array("partition1", "partion2"),
array("param1" => 'foo', "param2" => 'bar')
);
@ -226,7 +222,7 @@ class PMA_Operations_Test extends PHPUnit_Framework_TestCase
}
/**
* Test for PMA_getHtmlForReferentialIntegrityCheck
* Test for Operations::getHtmlForReferentialIntegrityCheck
*
* @return void
*/
@ -235,7 +231,7 @@ class PMA_Operations_Test extends PHPUnit_Framework_TestCase
$this->assertRegExp(
'/.*Check referential integrity.*href="sql.php(.|[\n])*/m',
PMA_getHtmlForReferentialIntegrityCheck(
Operations::getHtmlForReferentialIntegrityCheck(
array(
array(
'foreign_db' => 'db1',

20
view_operations.php
View File

@ -5,9 +5,12 @@
*
* @package PhpMyAdmin
*/
use PhpMyAdmin\Table;
use PhpMyAdmin\Message;
use PhpMyAdmin\Operations;
use PhpMyAdmin\Response;
use PhpMyAdmin\Table;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
/**
*
@ -16,11 +19,6 @@ require_once './libraries/common.inc.php';
$pma_table = new Table($GLOBALS['table'], $GLOBALS['db']);
/**
* functions implementation for this script
*/
require_once 'libraries/operations.lib.php';
/**
* Load JavaScript files
*/
@ -39,7 +37,7 @@ $url_params['goto'] = $url_params['back'] = 'view_operations.php';
/**
* Updates if required
*/
$_message = new PhpMyAdmin\Message;
$_message = new Message;
$_type = 'success';
if (isset($_REQUEST['submitoptions'])) {
@ -57,7 +55,7 @@ if (isset($_REQUEST['submitoptions'])) {
}
}
$warning_messages = PMA_getWarningMessagesArray();
$warning_messages = Operations::getWarningMessagesArray();
}
if (isset($result)) {
@ -79,7 +77,7 @@ if (isset($result)) {
$_message->isError(true);
unset($warning_messages);
}
echo PhpMyAdmin\Util::getMessage(
echo Util::getMessage(
$_message, $sql_query, $_type
);
}
@ -120,7 +118,7 @@ $url_params['back'] = 'view_operations.php';
$drop_view_url_params = array_merge(
$url_params,
array(
'sql_query' => 'DROP VIEW ' . PhpMyAdmin\Util::backquote(
'sql_query' => 'DROP VIEW ' . Util::backquote(
$GLOBALS['table']
),
'goto' => 'tbl_structure.php',
@ -138,7 +136,7 @@ echo '<fieldset class="caution">';
echo '<legend>' , __('Delete data or table') , '</legend>';
echo '<ul>';
echo PMA_getDeleteDataOrTableLink(
echo Operations::getDeleteDataOrTablelink(
$drop_view_url_params,
'DROP VIEW',
__('Delete the view (DROP)'),