From 1be8a0f73c50c228e35e88f510ae6be32d6cbbfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 29 May 2012 15:09:06 +0200 Subject: [PATCH 1/7] Fix typo --- libraries/sqlparser.lib.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 8ddb58e987..32466d7ff7 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -2099,10 +2099,10 @@ function PMA_SQP_formatHtml_colorize($arr) /** * Formats SQL queries to html * - * @param array $arr The SQL queries - * @param string $mode mode of printing - * @param integer $start_token starting token - * @param integer $numbr_of_tokens number of tokens to format, -1 = all + * @param array $arr The SQL queries + * @param string $mode mode of printing + * @param integer $start_token starting token + * @param integer $number_of_tokens number of tokens to format, -1 = all * * @return string The formatted SQL queries * From 68877049dd9d22fd585cd29d4804244c5e1ac2a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 29 May 2012 15:09:59 +0200 Subject: [PATCH 2/7] Fix typo --- libraries/sqlparser.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 32466d7ff7..6a79c30f7b 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -2076,7 +2076,7 @@ function PMA_SQP_analyze($arr) * @todo check why adding a "\n" after the would cause extra blanks * to be displayed: SELECT p . person_name * - * @param array $arr The SQL queries html formatted + * @param array $arr The SQL queries html formatted * * @return array The colorized SQL queries * From 354231114fd2ad533e53f73e5949dc196a28e50b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 29 May 2012 15:11:14 +0200 Subject: [PATCH 3/7] Add missing phpdoc directives --- libraries/sqlparser.lib.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 6a79c30f7b..08ae2ac1ac 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -118,6 +118,8 @@ function PMA_SQP_isError() * @param string $message The error message * @param string $sql The failing SQL query * + * @return nothing + * * @access private * @scope SQL Parser internal */ @@ -2073,13 +2075,13 @@ function PMA_SQP_analyze($arr) /** * Colorizes SQL queries html formatted * - * @todo check why adding a "\n" after the would cause extra blanks - * to be displayed: SELECT p . person_name - * * @param array $arr The SQL queries html formatted * * @return array The colorized SQL queries * + * @todo check why adding a "\n" after the would cause extra blanks + * to be displayed: SELECT p . person_name + * * @access public */ function PMA_SQP_formatHtml_colorize($arr) From bdc8c464895e302c606066f7589f113f58b23dcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 29 May 2012 15:12:51 +0200 Subject: [PATCH 4/7] Fix indentation --- libraries/sqlparser.lib.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 08ae2ac1ac..1d13c70b11 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -469,10 +469,10 @@ function PMA_SQP_parse($sql) // Checks for identifier (alpha or numeric) if (PMA_STR_isSqlIdentifier($c, false) - || $c == '@' - || ($c == '.' - && PMA_STR_isDigit(PMA_substr($sql, $count2 + 1, 1)) - && ($previous_was_space || $previous_was_bracket || $previous_was_listsep)) + || $c == '@' + || ($c == '.' + && PMA_STR_isDigit(PMA_substr($sql, $count2 + 1, 1)) + && ($previous_was_space || $previous_was_bracket || $previous_was_listsep)) ) { /* DEBUG echo PMA_substr($sql, $count2); @@ -773,12 +773,12 @@ function PMA_SQP_parse($sql) $t_suffix = '_reservedWord'; } // Binary as character set - if ($d_cur_upper == 'BINARY' && ( - ($d_bef_prev_upper == 'CHARACTER' && $d_prev_upper == 'SET') - || ($d_bef_prev_upper == 'SET' && $d_prev_upper == '=') - || ($d_bef_prev_upper == 'CHARSET' && $d_prev_upper == '=') - || $d_prev_upper == 'CHARSET' - ) && in_array($d_cur, $mysql_charsets) + if ($d_cur_upper == 'BINARY' + && (($d_bef_prev_upper == 'CHARACTER' && $d_prev_upper == 'SET') + || ($d_bef_prev_upper == 'SET' && $d_prev_upper == '=') + || ($d_bef_prev_upper == 'CHARSET' && $d_prev_upper == '=') + || $d_prev_upper == 'CHARSET') + && in_array($d_cur, $mysql_charsets) ) { $t_suffix = '_charset'; } From 1327d0c51295bbe28b13733352c0f6ff8cdb6b2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 29 May 2012 15:13:02 +0200 Subject: [PATCH 5/7] Remove unused code --- libraries/sqlparser.lib.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 1d13c70b11..8297a4559e 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -1119,9 +1119,7 @@ function PMA_SQP_analyze($arr) } // ============================================================== - if ($arr[$i]['type'] == 'alpha_reservedWord' - //&& $arr[$i]['forbidden'] == false) { - ) { + if ($arr[$i]['type'] == 'alpha_reservedWord') { // We don't know what type of query yet, so run this if ($subresult['querytype'] == '') { $subresult['querytype'] = strtoupper($arr[$i]['data']); From b684de82e0e628114df0524484f8a4d3a7af84e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 29 May 2012 15:13:18 +0200 Subject: [PATCH 6/7] Fix indentation --- libraries/sqlparser.lib.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 8297a4559e..53b193ff0e 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -1164,10 +1164,10 @@ function PMA_SQP_analyze($arr) // ============================== if ($arr[$i]['type'] == 'quote_backtick' - || $arr[$i]['type'] == 'quote_double' - || $arr[$i]['type'] == 'quote_single' - || $arr[$i]['type'] == 'alpha_identifier' - || ($arr[$i]['type'] == 'alpha_reservedWord' + || $arr[$i]['type'] == 'quote_double' + || $arr[$i]['type'] == 'quote_single' + || $arr[$i]['type'] == 'alpha_identifier' + || ($arr[$i]['type'] == 'alpha_reservedWord' && $arr[$i]['forbidden'] == false) ) { switch ($arr[$i]['type']) { From f6621b31e23f1810b547beaf8e0c23ec4108b627 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 29 May 2012 15:20:31 +0200 Subject: [PATCH 7/7] Coding style improvements --- libraries/sqlparser.lib.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 53b193ff0e..6d2743f218 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -1313,10 +1313,10 @@ function PMA_SQP_analyze($arr) */ if (isset($chain) && $seen_from && $save_table_ref - && ($arr[$i]['type'] == 'punct_listsep' - || ($arr[$i]['type'] == 'alpha_reservedWord' && $upper_data!="AS") - || $seen_end_of_table_ref - || $i==$size-1) + && ($arr[$i]['type'] == 'punct_listsep' + || ($arr[$i]['type'] == 'alpha_reservedWord' && $upper_data != "AS") + || $seen_end_of_table_ref + || $i == $size - 1) ) { $size_chain = count($chain);