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

Merge pull request #13972 from mauriciofauth/insert-edit

Browse Source 
Refactor PhpMyAdmin\InsertEdit class
This commit is contained in:
Maurício Meneghini Fauth 2018-02-06 19:39:11 -02:00 committed by GitHub
commit 4fd849efb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 1194 additions and 647 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1153
libraries/classes/InsertEdit.php
View File

File diff suppressed because it is too large Load Diff

32
tbl_change.php
View File

@ -24,13 +24,15 @@ PageSettings::showGroup('Edit');
*/
require_once 'libraries/db_table_exists.inc.php';
$insertEdit = new InsertEdit($GLOBALS['dbi']);
/**
* Determine whether Insert or Edit and set global variables
*/
list(
$insert_mode, $where_clause, $where_clause_array, $where_clauses,
$result, $rows, $found_unique_key, $after_insert
) = InsertEdit::determineInsertOrEdit(
) = $insertEdit->determineInsertOrEdit(
isset($where_clause) ? $where_clause : null, $db, $table
);
// Increase number of rows if unsaved rows are more
@ -52,11 +54,11 @@ if (empty($GLOBALS['goto'])) {
}
$_url_params = InsertEdit::getUrlParameters($db, $table);
$_url_params = $insertEdit->getUrlParameters($db, $table);
$err_url = $GLOBALS['goto'] . Url::getCommon($_url_params);
unset($_url_params);
$comments_map = InsertEdit::getCommentsMap($db, $table);
$comments_map = $insertEdit->getCommentsMap($db, $table);
/**
* START REGULAR OUTPUT
@ -82,13 +84,13 @@ if (! empty($disp_message)) {
$response->addHTML(Util::getMessage($disp_message, null));
}
$table_columns = InsertEdit::getTableColumns($db, $table);
$table_columns = $insertEdit->getTableColumns($db, $table);
// retrieve keys into foreign fields, if any
$foreigners = Relation::getForeigners($db, $table);
// Retrieve form parameters for insert/edit form
$_form_params = InsertEdit::getFormParametersForInsertForm(
$_form_params = $insertEdit->getFormParametersForInsertForm(
$db, $table, $where_clauses, $where_clause_array, $err_url
);
@ -115,13 +117,13 @@ $biggest_max_file_size = 0;
$url_params['db'] = $db;
$url_params['table'] = $table;
$url_params = InsertEdit::urlParamsInEditMode(
$url_params = $insertEdit->urlParamsInEditMode(
$url_params, $where_clause_array, $where_clause
);
$has_blob_field = false;
foreach ($table_columns as $column) {
if (InsertEdit::isColumn(
if ($insertEdit->isColumn(
$column,
array('blob', 'tinyblob', 'mediumblob', 'longblob')
)) {
@ -132,7 +134,7 @@ foreach ($table_columns as $column) {
//Insert/Edit form
//If table has blob fields we have to disable ajax.
$html_output .= InsertEdit::getHtmlForInsertEditFormHeader($has_blob_field, $is_upload);
$html_output .= $insertEdit->getHtmlForInsertEditFormHeader($has_blob_field, $is_upload);
$html_output .= Url::getHiddenInputs($_form_params);
@ -145,11 +147,11 @@ if (! $cfg['ShowFunctionFields'] || ! $cfg['ShowFieldTypesInDataEditView']) {
}
if (! $cfg['ShowFunctionFields']) {
$html_output .= InsertEdit::showTypeOrFunction('function', $url_params, false);
$html_output .= $insertEdit->showTypeOrFunction('function', $url_params, false);
}
if (! $cfg['ShowFieldTypesInDataEditView']) {
$html_output .= InsertEdit::showTypeOrFunction('type', $url_params, false);
$html_output .= $insertEdit->showTypeOrFunction('type', $url_params, false);
}
$GLOBALS['plugin_scripts'] = array();
@ -171,10 +173,10 @@ foreach ($rows as $row_id => $current_row) {
$checked = false;
}
if ($insert_mode && $row_id > 0) {
$html_output .= InsertEdit::getHtmlForIgnoreOption($row_id, $checked);
$html_output .= $insertEdit->getHtmlForIgnoreOption($row_id, $checked);
}
$html_output .= InsertEdit::getHtmlForInsertEditRow(
$html_output .= $insertEdit->getHtmlForInsertEditRow(
$url_params, $table_columns, $comments_map, $timestamp_seen,
$current_result, $chg_evt_handler, $jsvkey, $vkey, $insert_mode,
$current_row, $o_rows, $tabindex, $columns_cnt,
@ -191,7 +193,7 @@ if (! isset($after_insert)) {
}
//action panel
$html_output .= InsertEdit::getActionsPanel(
$html_output .= $insertEdit->getActionsPanel(
$where_clause, $after_insert, $tabindex,
$tabindex_for_value, $found_unique_key
);
@ -204,12 +206,12 @@ if ($biggest_max_file_size > 0) {
}
$html_output .= '</form>';
$html_output .= InsertEdit::getHtmlForGisEditor();
$html_output .= $insertEdit->getHtmlForGisEditor();
// end Insert/Edit form
if ($insert_mode) {
//Continue insertion form
$html_output .= InsertEdit::getContinueInsertionForm(
$html_output .= $insertEdit->getContinueInsertionForm(
$table, $db, $where_clause_array, $err_url
);
}

51
tbl_replace.php
View File

@ -13,12 +13,15 @@
*/
use PhpMyAdmin\Core;
use PhpMyAdmin\File;
use PhpMyAdmin\InsertEdit;
use PhpMyAdmin\Message;
use PhpMyAdmin\Plugins\IOTransformationsPlugin;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Response;
use PhpMyAdmin\Table;
use PhpMyAdmin\Transformations;
use PhpMyAdmin\Util;
/**
* Gets some core libraries
@ -26,7 +29,7 @@ use PhpMyAdmin\Transformations;
require_once 'libraries/common.inc.php';
// Check parameters
PhpMyAdmin\Util::checkParameters(array('db', 'table', 'goto'));
Util::checkParameters(array('db', 'table', 'goto'));
$GLOBALS['dbi']->selectDb($GLOBALS['db']);
@ -44,8 +47,10 @@ $scripts->addFile('sql.js');
$scripts->addFile('indexes.js');
$scripts->addFile('gis_data_editor.js');
$insertEdit = new InsertEdit($GLOBALS['dbi']);
// check whether insert row mode, if so include tbl_change.php
InsertEdit::isInsertRow();
$insertEdit->isInsertRow();
$after_insert_actions = array('new_insert', 'same_insert', 'edit_next');
if (isset($_REQUEST['after_insert'])
@ -57,22 +62,22 @@ if (isset($_REQUEST['after_insert'])
if ($_REQUEST['after_insert'] == 'same_insert') {
$url_params['where_clause'][] = $one_where_clause;
} elseif ($_REQUEST['after_insert'] == 'edit_next') {
InsertEdit::setSessionForEditNext($one_where_clause);
$insertEdit->setSessionForEditNext($one_where_clause);
}
}
}
}
//get $goto_include for different cases
$goto_include = InsertEdit::getGotoInclude($goto_include);
$goto_include = $insertEdit->getGotoInclude($goto_include);
// Defines the url to return in case of failure of the query
$err_url = InsertEdit::getErrorUrl($url_params);
$err_url = $insertEdit->getErrorUrl($url_params);
/**
* Prepares the update/insert of a row
*/
list($loop_array, $using_key, $is_insert, $is_insertignore)
= InsertEdit::getParamsForUpdateOrInsert();
= $insertEdit->getParamsForUpdateOrInsert();
$query = array();
$value_sets = array();
@ -203,7 +208,7 @@ foreach ($loop_array as $rownumber => $where_clause) {
// Note: $key is an md5 of the fieldname. The actual fieldname is
// available in $multi_edit_columns_name[$key]
$file_to_insert = new PhpMyAdmin\File();
$file_to_insert = new File();
$file_to_insert->checkTblChangeForm($key, $rownumber);
$possibly_uploaded_val = $file_to_insert->getContent();
@ -249,7 +254,7 @@ foreach ($loop_array as $rownumber => $where_clause) {
// delete $file_to_insert temporary variable
$file_to_insert->cleanUp();
$current_value = InsertEdit::getCurrentValueForDifferentTypes(
$current_value = $insertEdit->getCurrentValueForDifferentTypes(
$possibly_uploaded_val, $key, $multi_edit_columns_type,
$current_value, $multi_edit_auto_increment,
$rownumber, $multi_edit_columns_name, $multi_edit_columns_null,
@ -257,7 +262,7 @@ foreach ($loop_array as $rownumber => $where_clause) {
$using_key, $where_clause, $table, $multi_edit_funcs
);
$current_value_as_an_array = InsertEdit::getCurrentValueAsAnArrayForMultipleEdit(
$current_value_as_an_array = $insertEdit->getCurrentValueAsAnArrayForMultipleEdit(
$multi_edit_funcs,
$multi_edit_salt, $gis_from_text_functions, $current_value,
$gis_from_wkb_functions, $func_optional_param, $func_no_param, $key
@ -265,7 +270,7 @@ foreach ($loop_array as $rownumber => $where_clause) {
if (! isset($multi_edit_virtual) || ! isset($multi_edit_virtual[$key])) {
list($query_values, $query_fields)
= InsertEdit::getQueryValuesForInsertAndUpdateInMultipleEdit(
= $insertEdit->getQueryValuesForInsertAndUpdateInMultipleEdit(
$multi_edit_columns_name, $multi_edit_columns_null,
$current_value, $multi_edit_columns_prev, $multi_edit_funcs,
$is_insert, $query_values, $query_fields,
@ -288,7 +293,7 @@ foreach ($loop_array as $rownumber => $where_clause) {
$value_sets[] = implode(', ', $query_values);
} else {
// build update query
$query[] = 'UPDATE ' . PhpMyAdmin\Util::backquote($GLOBALS['table'])
$query[] = 'UPDATE ' . Util::backquote($GLOBALS['table'])
. ' SET ' . implode(', ', $query_values)
. ' WHERE ' . $where_clause
. ($_REQUEST['clause_is_unique'] ? '' : ' LIMIT 1');
@ -305,12 +310,12 @@ unset(
// Builds the sql query
if ($is_insert && count($value_sets) > 0) {
$query = InsertEdit::buildSqlQuery($is_insertignore, $query_fields, $value_sets);
$query = $insertEdit->buildSqlQuery($is_insertignore, $query_fields, $value_sets);
} elseif (empty($query) && ! isset($_REQUEST['preview_sql']) && !$row_skipped) {
// No change -> move back to the calling script
//
// Note: logic passes here for inline edit
$message = PhpMyAdmin\Message::success(__('No change'));
$message = Message::success(__('No change'));
// Avoid infinite recursion
if ($goto_include == 'tbl_replace.php') {
$goto_include = 'tbl_change.php';
@ -332,15 +337,15 @@ if (isset($_REQUEST['preview_sql'])) {
*/
list ($url_params, $total_affected_rows, $last_messages, $warning_messages,
$error_messages, $return_to_sql_query)
= InsertEdit::executeSqlQuery($url_params, $query);
= $insertEdit->executeSqlQuery($url_params, $query);
if ($is_insert && (count($value_sets) > 0 || $row_skipped)) {
$message = PhpMyAdmin\Message::getMessageForInsertedRows(
$message = Message::getMessageForInsertedRows(
$total_affected_rows
);
$unsaved_values = array_values($unsaved_values);
} else {
$message = PhpMyAdmin\Message::getMessageForAffectedRows(
$message = Message::getMessageForAffectedRows(
$total_affected_rows
);
}
@ -389,12 +394,12 @@ if ($response->isAjax() && ! isset($_POST['ajax_page_request'])) {
foreach ($relation_fields as $cell_index => $curr_rel_field) {
foreach ($curr_rel_field as $relation_field => $relation_field_value) {
$where_comparison = "='" . $relation_field_value . "'";
$dispval = InsertEdit::getDisplayValueForForeignTableColumn(
$dispval = $insertEdit->getDisplayValueForForeignTableColumn(
$where_comparison, $map, $relation_field
);
$extra_data['relations'][$cell_index]
= InsertEdit::getLinkForRelationalDisplayField(
= $insertEdit->getLinkForRelationalDisplayField(
$map, $relation_field, $where_comparison,
$dispval, $relation_field_value
);
@ -418,7 +423,7 @@ if ($response->isAjax() && ! isset($_POST['ajax_page_request'])) {
$column_name = $transformation['column_name'];
foreach ($transformation_types as $type) {
$file = Core::securePath($transformation[$type]);
$extra_data = InsertEdit::transformEditedValues(
$extra_data = $insertEdit->transformEditedValues(
$db, $table, $transformation, $edited_values, $file,
$column_name, $extra_data, $type
);
@ -430,7 +435,7 @@ if ($response->isAjax() && ! isset($_POST['ajax_page_request'])) {
// without informing while saving
$column_name = $_REQUEST['fields_name']['multi_edit'][0][0];
InsertEdit::verifyWhetherValueCanBeTruncatedAndAppendExtraData(
$insertEdit->verifyWhetherValueCanBeTruncatedAndAppendExtraData(
$db, $table, $column_name, $extra_data
);
@ -438,8 +443,10 @@ if ($response->isAjax() && ! isset($_POST['ajax_page_request'])) {
$_table = new Table($_REQUEST['table'], $_REQUEST['db']);
$extra_data['row_count'] = $_table->countRecords();
$extra_data['sql_query']
= PhpMyAdmin\Util::getMessage($message, $GLOBALS['display_query']);
$extra_data['sql_query'] = Util::getMessage(
$message,
$GLOBALS['display_query']
);
$response->setRequestStatus($message->isSuccess());
$response->addJSON('message', $message);

605
test/classes/InsertEditTest.php
View File

File diff suppressed because it is too large Load Diff