diff --git a/ChangeLog b/ChangeLog index b94eb0e91..ffc6c7191 100755 --- a/ChangeLog +++ b/ChangeLog @@ -11,11 +11,12 @@ $Source$ * lang/japanese: Update, thanks to Tadashi Jokagi - elf2000. * lang/italian: update, thanks to Luca Rebellato * lang/norwegian: Update, thanks to Sven-Erik Andersen + * db_details_structure.php: bug #1396998, notice for view row count + in table list 2006-01-28 Marc Delisle * libraries/common.lib.php: bug #1396998, avoid displaying exact row - count for views, work in progress. TODO: display the $strViewMaxExactCount - message, and change Documentation.html + count for views, work in progress 2006-01-26 Michal Čihař * lang/czech: Translation update. diff --git a/db_details_structure.php b/db_details_structure.php index fe7a71727..79684fe7f 100644 --- a/db_details_structure.php +++ b/db_details_structure.php @@ -151,6 +151,8 @@ $row_count = 0; $hidden_fields = array(); $odd_row = true; +$at_least_one_view = false; + foreach ( $tables as $keyname => $each_table ) { if ( $each_table['TABLE_ROWS'] === null || $each_table['TABLE_ROWS'] < $GLOBALS['cfg']['MaxExactCount']) { $each_table['TABLE_ROWS'] = PMA_countRecords( $db, @@ -161,6 +163,9 @@ foreach ( $tables as $keyname => $each_table ) { // MySQL < 5.0.13 returns "view", >= 5.0.13 returns "VIEW" $table_is_view = ( $each_table['TABLE_TYPE'] === 'VIEW' || $each_table['TABLE_TYPE'] === 'SYSTEM VIEW' ); + if ($table_is_view) { + $at_least_one_view = true; + } $alias = (!empty($tooltip_aliasname) && isset($tooltip_aliasname[$each_table['TABLE_NAME']])) ? htmlspecialchars($tooltip_aliasname[$each_table['TABLE_NAME']]) @@ -317,7 +322,7 @@ foreach ( $tables as $keyname => $each_table ) { - + = $cfg['MaxExactCount'] ? '1' : ''); ?> 1)) { ?> @@ -441,6 +446,15 @@ echo '