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

bug #1389165, shows all columns as Null Yes

Browse Source
This commit is contained in:
Marc Delisle
2006-01-06 18:05:53 +00:00
parent 036f71d51b
commit 97bd2323d5
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -6,7 +6,8 @@ $Id$
$Source$ $Source$
2006-01-06 Marc Delisle <lem9@users.sourceforge.net> 2006-01-06 Marc Delisle <lem9@users.sourceforge.net>
* db_datadict.php: bug #1389165, data dict shows all columns as Null Yes * db_datadict.php, pdf_schema.php: bug #1389165, data dict shows all
columns as Null Yes
2006-01-04 Marc Delisle <lem9@users.sourceforge.net> 2006-01-04 Marc Delisle <lem9@users.sourceforge.net>
* server_privileges.php: since we use DROP USER, some options to * server_privileges.php: since we use DROP USER, some options to

2
db_datadict.php
View File

@@ -216,7 +216,7 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) {
$strAttribute = 'UNSIGNED ZEROFILL'; $strAttribute = 'UNSIGNED ZEROFILL';
} }
if (!isset($row['Default'])) { if (!isset($row['Default'])) {
if ($row['Null'] != '') { if ($row['Null'] != '' && $row['Null'] != 'NO') {
$row['Default'] = '<i>NULL</i>'; $row['Default'] = '<i>NULL</i>';
} }
} else { } else {

2
pdf_schema.php
View File

@@ -1479,7 +1479,7 @@ function PMA_RT_DOC($alltables ){
$pdf_row = array($field_name , $pdf_row = array($field_name ,
$type , $type ,
$strAttribute , $strAttribute ,
($row['Null'] == '') ? $GLOBALS['strNo'] : $GLOBALS['strYes'], ($row['Null'] == '' || $row['Null'] == 'NO') ? $GLOBALS['strNo'] : $GLOBALS['strYes'],
((isset($row['Default'])) ? $row['Default'] : ''), ((isset($row['Default'])) ? $row['Default'] : ''),
$row['Extra'] , $row['Extra'] ,
((isset($res_rel[$field_name])) ? $res_rel[$field_name]['foreign_table'] . ' -> ' . $res_rel[$field_name]['foreign_field'] : ''), ((isset($res_rel[$field_name])) ? $res_rel[$field_name]['foreign_table'] . ' -> ' . $res_rel[$field_name]['foreign_field'] : ''),