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

for Loic

Browse Source
This commit is contained in:
Marc Delisle
2002-07-29 16:11:30 +00:00
parent 1369befc9d
commit f3dc6788a6
5 changed files with 45 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -5,6 +5,15 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2002-07-29 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* tbl_change.php3, line 203: fixed an xhtml bug (#587974) thanks to
Christophe Jaillet <tititou at users.sourceforge.net>
* libraries/sqlparser.lib.php3: fixed parse errors (bug #588010)
thanks to Nagi Peters <nagipeters at users.sourceforge.net> and
coding standards.
* Documentation.html: coding standards.
* libraries/relation.lib.php3: beautified generated page.
2002-07-28 Marc Delisle <lem9@users.sourceforge.net> 2002-07-28 Marc Delisle <lem9@users.sourceforge.net>
* lang/romanian update, thanks to Valics Lehel * lang/romanian update, thanks to Valics Lehel
* lang/polish update, thanks to Jakub Wilk * lang/polish update, thanks to Jakub Wilk

8
Documentation.html
View File

@@ -1681,8 +1681,8 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
</p> </p>
<p> <p>
<b>[3.2] When dumping a large table in compressed mode, I get a memory limit <b>[3.2] When dumping a large table in compressed mode, I get a memory
error or a time limit error.</b> limit error or a time limit error.</b>
<br /> <br />
As of version 2.2.4, we build the compressed dump in memory, so large As of version 2.2.4, we build the compressed dump in memory, so large
tables dumps may hang. The only alternative we can think about (using tables dumps may hang. The only alternative we can think about (using
@@ -1692,10 +1692,10 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
</p> </p>
<p> <p>
<b>[3.3] With InnoDB tables, I lose foreign key relationships when I rename <b>[3.3] With InnoDB tables, I lose foreign key relationships when I rename
or alter a table.</b> or alter a table.</b>
<br /> <br />
This seems to be a InnoDB bug (fixed in MySQL 3.23.50?). However, keep This seems to be a InnoDB bug (fixed in MySQL 3.23.50?). However, keep
in mind that phpMyAdmin as of version 2.3.0 does not support InnoDB. in mind that phpMyAdmin as of version 2.3.0 does not support InnoDB.
</p> </p>

26
libraries/relation.lib.php3
View File

@@ -149,36 +149,42 @@ if (!defined('PMA_RELATION_LIB_INCLUDED')){
$disabled = '<font color="red">' . $GLOBALS['strDisabled'] . '</font>'; $disabled = '<font color="red">' . $GLOBALS['strDisabled'] . '</font>';
echo '<table>' . "\n"; echo '<table>' . "\n";
echo '<tr><th align="left">PMA Database ... </th><td align="right">' echo ' <tr><th align="left">PMA Database ... </th><td align="right">'
. (($cfg['Server']['pmadb'] == FALSE) ? sprintf($shit, 'pmadb') : $hit) . (($cfg['Server']['pmadb'] == FALSE) ? sprintf($shit, 'pmadb') : $hit)
. '</td></tr>' . "\n"; . '</td></tr>' . "\n";
echo '<tr><th align="left">relation Table ... </th><td align="right">' echo ' <tr><td>&nbsp;</td></tr>' . "\n";
echo ' <tr><th align="left">relation Table ... </th><td align="right">'
. ((isset($cfgRelation['relation'])) ? $hit : sprintf($shit, 'relation')) . ((isset($cfgRelation['relation'])) ? $hit : sprintf($shit, 'relation'))
. '</td></tr>' . "\n"; . '</td></tr>' . "\n";
echo '<tr><td colspan=2 align="center">'. $GLOBALS['strGeneralRelationFeat'] . ': ' echo ' <tr><td colspan=2 align="center">'. $GLOBALS['strGeneralRelationFeat'] . ': '
. (($cfgRelation['relwork'] == TRUE) ? $enabled : $disabled) . (($cfgRelation['relwork'] == TRUE) ? $enabled : $disabled)
. '</td></tr>' . "\n"; . '</td></tr>' . "\n";
echo ' <tr><td>&nbsp;</td></tr>' . "\n";
echo '<tr><th align="left">table_info ... </th><td align="right">' echo ' <tr><th align="left">table_info ... </th><td align="right">'
. (($cfgRelation['displaywork'] == FALSE) ? sprintf($shit, 'table_info') : $hit) . (($cfgRelation['displaywork'] == FALSE) ? sprintf($shit, 'table_info') : $hit)
. '</td></tr>' . "\n"; . '</td></tr>' . "\n";
echo '<tr><td colspan=2 align="center">' . $GLOBALS['strDisplayFeat'] . ': ' echo ' <tr><td colspan=2 align="center">' . $GLOBALS['strDisplayFeat'] . ': '
. (($cfgRelation['displaywork'] == TRUE) ? $enabled : $disabled) . (($cfgRelation['displaywork'] == TRUE) ? $enabled : $disabled)
. '</td></tr>' . "\n"; . '</td></tr>' . "\n";
echo ' <tr><td>&nbsp;</td></tr>' . "\n";
echo '<tr><th align="left">table_coords ... </th><td align="right">' echo ' <tr><th align="left">table_coords ... </th><td align="right">'
. ((isset($cfgRelation['table_coords'])) ? $hit : sprintf($shit, 'table_coords')) . ((isset($cfgRelation['table_coords'])) ? $hit : sprintf($shit, 'table_coords'))
. '</td></tr>' . "\n"; . '</td></tr>' . "\n";
echo '<tr><th align="left">pdf_pages ... </th><td align="right">' echo ' <tr><th align="left">pdf_pages ... </th><td align="right">'
. ((isset($cfgRelation['pdf_pages'])) ? $hit : sprintf($shit, 'table_coords')) . ((isset($cfgRelation['pdf_pages'])) ? $hit : sprintf($shit, 'table_coords'))
. '</td></tr>' . "\n"; . '</td></tr>' . "\n";
echo '<tr><td colspan=2 align="center">' . $GLOBALS['strCreatePdfFeat'] . ': ' echo ' <tr><td colspan=2 align="center">' . $GLOBALS['strCreatePdfFeat'] . ': '
. (($cfgRelation['pdfwork'] == TRUE) ? $enabled : $disabled) . (($cfgRelation['pdfwork'] == TRUE) ? $enabled : $disabled)
. '</td></tr>' . "\n"; . '</td></tr>' . "\n";
echo '<tr><th align="left">column_comments ... </th><td align="right">' echo ' <tr><td>&nbsp;</td></tr>' . "\n";
echo ' <tr><th align="left">column_comments ... </th><td align="right">'
. ((isset($cfgRelation['column_comments'])) ? $hit : sprintf($shit, 'col_com')) . ((isset($cfgRelation['column_comments'])) ? $hit : sprintf($shit, 'col_com'))
. '</td></tr>' . "\n"; . '</td></tr>' . "\n";
echo '<tr><td colspan=2 align="center">' . $GLOBALS['strColComFeat'] . ': ' echo ' <tr><td colspan=2 align="center">' . $GLOBALS['strColComFeat'] . ': '
. (($cfgRelation['commwork'] == TRUE) ? $enabled : $disabled) . (($cfgRelation['commwork'] == TRUE) ? $enabled : $disabled)
. '</td></tr>' . "\n"; . '</td></tr>' . "\n";
echo '</table>' . "\n"; echo '</table>' . "\n";

30
libraries/sqlparser.lib.php3
View File

@@ -178,12 +178,12 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
break; break;
} }
// Check for MySQL escaping using a \ // Checks for MySQL escaping using a \
// And check for ANSI escaping using the $quotetype character // And checks for ANSI escaping using the $quotetype character
if (PMA_STR_charIsEscaped($sql, $pos) ) { if (PMA_STR_charIsEscaped($sql, $pos)) {
$pos ++; $pos ++;
continue; continue;
} else if (($sql[$pos] == $quotetype) && ($sql[$pos+1] == $quotetype)) { } else if (($sql[$pos] == $quotetype) && ($sql[$pos + 1] == $quotetype)) {
$pos = $pos + 2; $pos = $pos + 2;
continue; continue;
} else { } else {
@@ -391,7 +391,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
echo '---END CUT---<br /><br />' . "\n\n"; echo '---END CUT---<br /><br />' . "\n\n";
echo '</p>' . "\n"; echo '</p>' . "\n";
flush(); flush();
if (PMA_PHP_INT_VERSION >= 42000 && @function_exists('ob_flush')) { if (PMA_PHP_INT_VERSION >= 42000 && @function_exists('ob_flush')) {
ob_flush(); ob_flush();
} }
die(); die();
@@ -557,7 +557,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
'USING' 'USING'
); );
$keywords_with_brackets_1before_cnt = 3; $keywords_with_brackets_1before_cnt = 3;
$keywords_with_brackets_2before = array( $keywords_with_brackets_2before = array(
'IGNORE', 'IGNORE',
'INDEX', 'INDEX',
@@ -567,7 +567,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
'PROCEDURE', 'PROCEDURE',
'REFERENCES', 'REFERENCES',
'UNIQUE', 'UNIQUE',
'USE', 'USE'
); );
// $keywords_with_brackets_2before_cnt = count($keywords_with_brackets_2before); // $keywords_with_brackets_2before_cnt = count($keywords_with_brackets_2before);
$keywords_with_brackets_2before_cnt = 9; $keywords_with_brackets_2before_cnt = 9;
@@ -629,9 +629,9 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
// Make sure this array is sorted! // Make sure this array is sorted!
if (($typearr[1] == 'alpha_functionName') || ($typearr[1] == 'alpha_columnType') || ($typearr[1] == 'punct') if (($typearr[1] == 'alpha_functionName') || ($typearr[1] == 'alpha_columnType') || ($typearr[1] == 'punct')
|| ($typearr[3] == 'digit_integer') || ($typearr[3] == 'digit_hex') || ($typearr[3] == 'digit_float') || ($typearr[3] == 'digit_integer') || ($typearr[3] == 'digit_hex') || ($typearr[3] == 'digit_float')
|| (($typearr[0] == 'alpha_reservedWord') || (($typearr[0] == 'alpha_reservedWord')
&& PMA_STR_binarySearchInArr(strtoupper($arr[$i - 2]['data']), $keywords_with_brackets_2before, $keywords_with_brackets_2before_cnt)) && PMA_STR_binarySearchInArr(strtoupper($arr[$i - 2]['data']), $keywords_with_brackets_2before, $keywords_with_brackets_2before_cnt))
|| (($typearr[1] == 'alpha_reservedWord') || (($typearr[1] == 'alpha_reservedWord')
&& PMA_STR_binarySearchInArr(strtoupper($arr[$i - 1]['data']), $keywords_with_brackets_1before, $keywords_with_brackets_1before_cnt)) && PMA_STR_binarySearchInArr(strtoupper($arr[$i - 1]['data']), $keywords_with_brackets_1before, $keywords_with_brackets_1before_cnt))
) { ) {
$functionlevel++; $functionlevel++;
@@ -684,7 +684,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
if ($infunction == TRUE) { if ($infunction == TRUE) {
$functionlevel--; $functionlevel--;
$after .= ' '; $after .= ' ';
$before .= ' '; $before .= ' ';
} else { } else {
$indent--; $indent--;
$before .= '</div>'; $before .= '</div>';
@@ -696,15 +696,15 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
$after .= ' '; $after .= ' ';
} }
if ($typearr[1] == 'alpha_columnType') { if ($typearr[1] == 'alpha_columnType') {
$before .= ' '; $before .= ' ';
} }
break; break;
case 'alpha_reservedWord': case 'alpha_reservedWord':
$upper = $arr[$i]['data']; $upper = $arr[$i]['data'];
if ((($typearr[1] != 'alpha_reservedWord') if ((($typearr[1] != 'alpha_reservedWord')
|| (($typearr[1] == 'alpha_reservedWord') || (($typearr[1] == 'alpha_reservedWord')
&& PMA_STR_binarySearchInArr(strtoupper($arr[$i-1]['data']), $keywords_no_newline, $keywords_no_newline_cnt))) && PMA_STR_binarySearchInArr(strtoupper($arr[$i - 1]['data']), $keywords_no_newline, $keywords_no_newline_cnt)))
&& ($typearr[1] != 'punct_level_plus') && ($typearr[1] != 'punct_level_plus')
&& (!PMA_STR_binarySearchInArr($upper, $keywords_no_newline, $keywords_no_newline_cnt))) { && (!PMA_STR_binarySearchInArr($upper, $keywords_no_newline, $keywords_no_newline_cnt))) {
$before .= $space_alpha_reserved_word; $before .= $space_alpha_reserved_word;
} else { } else {

2
tbl_change.php3
View File

@@ -200,7 +200,7 @@ for ($i = 0; $i < $fields_cnt; $i++) {
<tr> <tr>
<th colspan="5" align="right"> <th colspan="5" align="right">
<input type="submit" value="<?php echo $strGo; ?>" tabindex="<?php echo $fields_cnt+6; ?>" />&nbsp; <input type="submit" value="<?php echo $strGo; ?>" tabindex="<?php echo $fields_cnt+6; ?>" />&nbsp;
</td> </th>
</tr> </tr>
<?php <?php
} // end if } // end if