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

Fold updateSqlData into new function

Browse Source 
Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
Michal Čihař 2015-12-16 14:45:32 +01:00
parent 189f893677
commit 135077bbc0
1 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libraries/import.lib.php
View File

@ -122,9 +122,13 @@ function PMA_executeQuery($sql = '', $full = '', &$sql_data)
);
}
updateSqlData(
$sql_data, $a_num_rows, $is_use_query, $sql
);
if (($a_num_rows > 0) || $is_use_query) {
$sql_data['valid_sql'][] = $sql;
if (!isset($sql_data['valid_queries'])) {
$sql_data['valid_queries'] = 0;
}
$sql_data['valid_queries']++;
}
}
if (! $sql_query_disabled) {
$sql_query .= $msg . "\n";
@ -277,27 +281,6 @@ function PMA_importRunQuery($sql = '', $full = '', &$sql_data = array())
}
}
/**
* Update $sql_data
*
* @param array &$sql_data SQL data
* @param int $a_num_rows Number of rows
* @param bool $is_use_query Query is used
* @param string $sql SQL query
*
* @return array
*/
function updateSqlData(&$sql_data, $a_num_rows, $is_use_query, $sql)
{
if (($a_num_rows > 0) || $is_use_query) {
$sql_data['valid_sql'][] = $sql;
if (!isset($sql_data['valid_queries'])) {
$sql_data['valid_queries'] = 0;
}
$sql_data['valid_queries']++;
}
}
/**
* Return import run buffer
*