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

no need to check for VIEW if we already know

Browse Source
This commit is contained in:
Sebastian Mendel
2008-05-08 05:36:57 +00:00
parent c69ae450aa
commit 1536decef8
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
db_structure.php
View File

@@ -223,7 +223,8 @@ foreach ($tables as $keyname => $each_table) {
if ($each_table['TABLE_ROWS'] < $GLOBALS['cfg']['MaxExactCount']) { if ($each_table['TABLE_ROWS'] < $GLOBALS['cfg']['MaxExactCount']) {
$each_table['COUNTED'] = true; $each_table['COUNTED'] = true;
$each_table['TABLE_ROWS'] = PMA_Table::countRecords($db, $each_table['TABLE_ROWS'] = PMA_Table::countRecords($db,
$each_table['TABLE_NAME'], $return = true, $force_exact = true); $each_table['TABLE_NAME'], $return = true, $force_exact = true,
$is_view = false);
} else { } else {
$each_table['COUNTED'] = false; $each_table['COUNTED'] = false;
} }
@@ -249,7 +250,8 @@ foreach ($tables as $keyname => $each_table) {
if ($each_table['TABLE_ROWS'] < $GLOBALS['cfg']['MaxExactCountViews']) { if ($each_table['TABLE_ROWS'] < $GLOBALS['cfg']['MaxExactCountViews']) {
$each_table['COUNTED'] = true; $each_table['COUNTED'] = true;
$each_table['TABLE_ROWS'] = PMA_Table::countRecords($db, $each_table['TABLE_ROWS'] = PMA_Table::countRecords($db,
$each_table['TABLE_NAME'], $return = true, $force_exact = true); $each_table['TABLE_NAME'], $return = true, $force_exact = true,
$is_view = true);
} else { } else {
$each_table['COUNTED'] = false; $each_table['COUNTED'] = false;
} }

11
libraries/Table.class.php
View File

@@ -375,7 +375,8 @@ class PMA_Table {
* *
* @access public * @access public
*/ */
static public function countRecords($db, $table, $ret = false, $force_exact = false) static public function countRecords($db, $table, $ret = false,
$force_exact = false, $is_view = null)
{ {
$row_count = false; $row_count = false;
@@ -386,11 +387,13 @@ class PMA_Table {
0, 'Rows'); 0, 'Rows');
} }
$tbl_is_view = PMA_Table::isView($db, $table); if (null === $is_view) {
$is_view = PMA_Table::isView($db, $table);
}
// for a VIEW, $row_count is always false at this point // for a VIEW, $row_count is always false at this point
if (false === $row_count || $row_count < $GLOBALS['cfg']['MaxExactCount']) { if (false === $row_count || $row_count < $GLOBALS['cfg']['MaxExactCount']) {
if (! $tbl_is_view) { if (! $is_view) {
$row_count = PMA_DBI_fetch_value( $row_count = PMA_DBI_fetch_value(
'SELECT COUNT(*) FROM ' . PMA_backquote($db) . '.' 'SELECT COUNT(*) FROM ' . PMA_backquote($db) . '.'
. PMA_backquote($table)); . PMA_backquote($table));
@@ -430,7 +433,7 @@ class PMA_Table {
// Note: as of PMA 2.8.0, we no longer seem to be using // Note: as of PMA 2.8.0, we no longer seem to be using
// PMA_Table::countRecords() in display mode. // PMA_Table::countRecords() in display mode.
echo PMA_formatNumber($row_count, 0); echo PMA_formatNumber($row_count, 0);
if ($tbl_is_view) { if ($is_view) {
echo '&nbsp;' echo '&nbsp;'
. sprintf($GLOBALS['strViewMaxExactCount'], . sprintf($GLOBALS['strViewMaxExactCount'],
$GLOBALS['cfg']['MaxExactCount'], $GLOBALS['cfg']['MaxExactCount'],