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

Multiline SQL statements should still be in one line even after Syntaxcoloring

Browse Source
This commit is contained in:
Mike Beck 2002-06-12 14:54:33 +00:00
parent 5e9f703bc7
commit 8907f9ad77
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libraries/common.lib.php3
View File

@ -204,7 +204,7 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}
* @author Mike Beck<mikebeck@users.sourceforge.net>
*/
function PMA_format_sql ($sql) {
global $cfg;
global $cfg, $mult;
$_sfuncs = '^' . implode('$|^', $cfg['Functions']) . '$';
$_skeyw = '^' . implode('$|^', $cfg['keywords']) . '$';
@ -218,6 +218,7 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}
$sql = str_replace(',', ', ', $sql);
$sql = str_replace(')', ' ) ', $sql);
$sql = str_replace('(', ' ( ', $sql);
$sql = str_replace(';', ' ; ', $sql);
// now split everything by the blanks
$_sql_parts=explode(' ',$sql);
// start a loop over the parts check each word and put them back into $sql
@ -251,7 +252,12 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}
$_word = '<font color="' . $cfg['colorFunctions'].'">' . $_word . '</font>';
} else {
if(eregi($_skeyw, $_word)) {
$_word = "\n".'<font color="' . $cfg['colorKeywords'].'">' . $_word . '</font>';
$_word = '<font color="' . $cfg['colorKeywords'].'">' . $_word . '</font>';
if(isset($mult) && $mult == TRUE){
} else {
$_word = "\n" . $_word;
}
} else {
if(eregi($_scoltype, $_word)) {
$_word = '<font color="' . $cfg['colorColType'].'">' . $_word . '</font>';
@ -268,6 +274,10 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}
} else {
$_brack_c[]=$s_nr;
}
} else {
if($_word==';') {
$_word = ";\n";
}
}
}
}
@ -293,7 +303,7 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}
}
}
$sql = implode(' ',$_sql_p);
return $sql;
return nl2br($sql);
} // End of PMA_format_sql function
/**
@ -338,9 +348,9 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}
. ']' . "\n";
} // end if
if($cfg['UseSyntaxColoring']){
echo '<pre>' . "\n" . PMA_format_sql($query_base) . "\n" . '</pre>' . "\n";
echo '<p>' . "\n" . PMA_format_sql($query_base) . "\n" . '</p>' . "\n";
} else {
echo '<pre>' . "\n" . $query_base . "\n" . '</pre>' . "\n";
echo '<p>' . "\n" . $query_base . "\n" . '</p>' . "\n";
}
echo '</p>' . "\n";
} // end if

2
read_dump.php3
View File

@ -320,6 +320,7 @@ if ($sql_query != '') {
$pieces = array();
PMA_splitSqlFile($pieces, $sql_query, PMA_MYSQL_INT_VERSION);
$pieces_count = count($pieces);
if($pieces_count>1){$is_multiple = TRUE;}
// Copy of the cleaned sql statement for display purpose only (see near the
// beginning of "db_details.php3" & "tbl_properties.php3")
@ -349,6 +350,7 @@ if ($sql_query != '') {
// Runs multiple queries
else if (mysql_select_db($db)) {
$mult = TRUE;
for ($i = 0; $i < $pieces_count; $i++) {
$a_sql_query = $pieces[$i];
$result = mysql_query($a_sql_query);