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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2015-03-30 19:23:47 +02:00
commit c40866dc85
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/import.lib.php
View File

@ -1509,23 +1509,22 @@ function PMA_getSimulatedUpdateQuery($analyzed_sql_results)
) {
break;
}
if(!$in_function){
if (!$in_function) {
if ($term['type'] == 'punct_listsep') {
$extra_where_clause[] = ' OR ';
} else if ($term['type'] == 'punct') {
$extra_where_clause[] = ' <> ';
} else if($term['type'] == 'alpha_functionName') {
} else if ($term['type'] == 'alpha_functionName') {
array_pop($extra_where_clause);
array_pop($extra_where_clause);
} else {
$extra_where_clause[] = $term['data'];
}
}
else if($term['type'] == 'punct_bracket_close_round') {
} else if ($term['type'] == 'punct_bracket_close_round') {
$in_function--;
}
if($term['type'] == 'alpha_functionName') {
if ($term['type'] == 'alpha_functionName') {
$in_function++;
}
@ -1560,7 +1559,9 @@ function PMA_getSimulatedUpdateQuery($analyzed_sql_results)
// Get WHERE clause.
$where_clause .= $analyzed_sql_results['analyzed_sql'][0]['where_clause'];
if (empty($where_clause)) {
$where_clause = (!empty($extra_where_clause) && $extra_where_clause[0]) ? implode(' ',$extra_where_clause) : '1';
$where_clause = (!empty($extra_where_clause) && $extra_where_clause[0])
? implode(' ', $extra_where_clause)
: '1';
}
$matched_row_query = 'SELECT '