From 4c4cee598a4c4a332424340ce1833213f70ea2ff Mon Sep 17 00:00:00 2001 From: Chirayu Chiripal Date: Fri, 13 Jun 2014 00:17:08 +0530 Subject: [PATCH] bugfix: insert queries not showing affected row counts Signed-off-by: Chirayu Chiripal --- ChangeLog | 1 + libraries/sqlparser.lib.php | 35 ++++++++++------------------------- 2 files changed, 11 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 52207aafcb2b..c2b02b8d9f81 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog - bug #4445 Fatal error on SQL Export of join query - bug #4448 Dump binary columns in hexadecimal notation not working - Regenerate cookie encryption IV for every session +- bug #4457 SQL tab - Insert queries not showing affected row count 4.2.3.0 (2014-06-08) - bug #4423 Moving fields not working diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index d2d53d893c23..7c8361294154 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -1667,28 +1667,22 @@ function PMA_SQP_analyze($arr) $subresult['querytype'] = $upper_data; $seen_reserved_word = true; - if ($first_reserved_word == 'SELECT') { + if ($first_reserved_word === 'SELECT') { $position_of_first_select = $i; - } - - if ($first_reserved_word == 'EXPLAIN') { + } elseif ($first_reserved_word === 'EXPLAIN') { $subresult['queryflags']['is_explain'] = 1; - } - - if ($first_reserved_word == 'DELETE') { + } elseif ($first_reserved_word === 'DELETE') { $subresult['queryflags']['is_delete'] = 1; $subresult['queryflags']['is_affected'] = 1; - } - - if ($first_reserved_word == 'UPDATE') { + } elseif ($first_reserved_word === 'UPDATE') { $subresult['queryflags']['is_affected'] = 1; - } - - if ($first_reserved_word == 'REPLACE') { + } elseif ($first_reserved_word === 'REPLACE') { $subresult['queryflags']['is_replace'] = 1; - } - - if ($first_reserved_word == 'SHOW') { + $subresult['queryflags']['is_affected'] = 1; + } elseif ($first_reserved_word === 'INSERT') { + $subresult['queryflags']['is_insert'] = 1; + $subresult['queryflags']['is_affected'] = 1; + } elseif ($first_reserved_word === 'SHOW') { $subresult['queryflags']['is_show'] = 1; } @@ -1706,15 +1700,6 @@ function PMA_SQP_analyze($arr) ) { $subresult['queryflags']['reload'] = 1; } - - // for the presence of INSERT|LOAD DATA - if (in_array($first_reserved_word, array('INSERT', 'LOAD')) - && $upper_data == 'REPLACE' - ) { - $subresult['queryflags']['is_insert'] = 1; - $subresult['queryflags']['is_affected'] = 1; - } - // for the presence of CHECK|ANALYZE|REPAIR|OPTIMIZE TABLE $keywords = array( 'CHECK', 'ANALYZE', 'REPAIR', 'OPTIMIZE'