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

596692

Browse Source
This commit is contained in:
Marc Delisle
2003-06-04 13:08:26 +00:00
parent 31c5474400
commit e194f0f031
2 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2003-06-04 Marc Delisle <lem9@users.sourceforge.net>
* libraries/sqlparser.lib.php3: bug 592692, pretty printer
and GRANT or REVOKE
2003-06-04 Michal Cihar <nijel@users.sourceforge.net> 2003-06-04 Michal Cihar <nijel@users.sourceforge.net>
* mult_submits.inc.php3: Use TRUNCATE when using MySQL 4 (bug #748792). * mult_submits.inc.php3: Use TRUNCATE when using MySQL 4 (bug #748792).

43
libraries/sqlparser.lib.php3
View File

@@ -1469,6 +1469,13 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
); );
$keywords_no_newline_cnt = 9; $keywords_no_newline_cnt = 9;
// These reserved words introduce a privilege list
$keywords_priv_list = array(
'GRANT',
'REVOKE'
);
$keywords_priv_list_cnt = 2;
$arraysize = $arr['len']; $arraysize = $arr['len'];
$typearr = array(); $typearr = array();
if ($arraysize >= 0) { if ($arraysize >= 0) {
@@ -1478,8 +1485,9 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
$typearr[3] = $arr[0]['type']; $typearr[3] = $arr[0]['type'];
} }
$in_priv_list = FALSE;
for ($i = 0; $i < $arraysize; $i++) { for ($i = 0; $i < $arraysize; $i++) {
// DEBUG echo "<b>" . $arr[$i]['data'] . "</b> " . $arr[$i]['type'] . "<br />"; //DEBUG echo "<b>" . $arr[$i]['data'] . "</b> " . $arr[$i]['type'] . "<br />";
$before = ''; $before = '';
$after = ''; $after = '';
$indent = 0; $indent = 0;
@@ -1554,6 +1562,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
$space_punct_listsep = ' '; $space_punct_listsep = ' ';
$space_punct_listsep_function_name = ' '; $space_punct_listsep_function_name = ' ';
$space_alpha_reserved_word = ' '; $space_alpha_reserved_word = ' ';
$in_priv_list = FALSE;
break; break;
case 'comment_mysql': case 'comment_mysql':
case 'comment_ansi': case 'comment_ansi':
@@ -1594,7 +1603,6 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
} }
break; break;
case 'alpha_reservedWord': case 'alpha_reservedWord':
//$upper = $arr[$i]['data'];
$arr[$i]['data'] = strtoupper($arr[$i]['data']); $arr[$i]['data'] = strtoupper($arr[$i]['data']);
if ((($typearr[1] != 'alpha_reservedWord') if ((($typearr[1] != 'alpha_reservedWord')
|| (($typearr[1] == 'alpha_reservedWord') || (($typearr[1] == 'alpha_reservedWord')
@@ -1604,8 +1612,19 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
// do not put a space before the first token, because // do not put a space before the first token, because
// we use a lot of eregi() checking for the first // we use a lot of eregi() checking for the first
// reserved word at beginning of query // reserved word at beginning of query
// so do not put a newline before
//
// also we must not be inside a privilege list
if ($i > 0) { if ($i > 0) {
$before .= $space_alpha_reserved_word; if (!$in_priv_list) {
$before .= $space_alpha_reserved_word;
}
} else {
// on first keyword, check if it introduces a
// privilege list
if (PMA_STR_binarySearchInArr($arr[$i]['data'], $keywords_priv_list, $keywords_priv_list_cnt)) {
$in_priv_list = TRUE;
}
} }
} else { } else {
$before .= ' '; $before .= ' ';
@@ -1613,8 +1632,10 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
switch ($arr[$i]['data']) { switch ($arr[$i]['data']) {
case 'CREATE': case 'CREATE':
$space_punct_listsep = $html_line_break; if (!$in_priv_list) {
$space_alpha_reserved_word = ' '; $space_punct_listsep = $html_line_break;
$space_alpha_reserved_word = ' ';
}
break; break;
case 'EXPLAIN': case 'EXPLAIN':
case 'DESCRIBE': case 'DESCRIBE':
@@ -1627,13 +1648,17 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
case 'TRUNCATE': case 'TRUNCATE':
case 'ANALYZE': case 'ANALYZE':
case 'ANALYSE': case 'ANALYSE':
$space_punct_listsep = $html_line_break; if (!$in_priv_list) {
$space_alpha_reserved_word = ' '; $space_punct_listsep = $html_line_break;
$space_alpha_reserved_word = ' ';
}
break; break;
case 'INSERT': case 'INSERT':
case 'REPLACE': case 'REPLACE':
$space_punct_listsep = $html_line_break; if (!$in_priv_list) {
$space_alpha_reserved_word = $html_line_break; $space_punct_listsep = $html_line_break;
$space_alpha_reserved_word = $html_line_break;
}
break; break;
case 'VALUES': case 'VALUES':
$space_punct_listsep = ' '; $space_punct_listsep = ' ';