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

Simplify getting table comment

Browse Source 
- remove not needed word Show from method name
- fix code to handle errors

Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
Michal Čihař 2017-03-06 09:35:22 +01:00
parent 56046cc7e2
commit b2bf9fba87
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/Menu.php
View File

@ -240,7 +240,7 @@ class Menu
$show_comment = null;
} else {
$tbl_is_view = false;
$show_comment = $table_class_object->getShowComment();
$show_comment = $table_class_object->getComment();
}
$retval .= $separator;
if (Util::showIcons('TabsMode')) {

5
libraries/Table.php
View File

@ -339,11 +339,12 @@ class Table
*
* @return string Return comment info if it is set for the selected table or return blank.
*/
public function getShowComment() {
public function getComment() {
$table_comment = $this->getStatusInfo('COMMENT', false, true);
if ($table_comment === false) {
return isset($table_comment) ? $table_comment : '';
return '';
}
return $table_comment;
}
/**

2
libraries/controllers/table/TableChartController.php
View File

@ -128,7 +128,7 @@ class TableChartController extends TableController
} else {
$tbl_is_view = false;
$tbl_storage_engine = $table_class_object->getStorageEngine();
$show_comment = $table_class_object->getShowComment();
$show_comment = $table_class_object->getComment();
}
$tbl_collation = $table_class_object->getTableCollation();
$table_info_num_rows = $table_class_object->getTableNumRowInfo();

2
libraries/controllers/table/TableIndexesController.php
View File

@ -76,7 +76,7 @@ class TableIndexesController extends TableController
} else {
$tbl_is_view = false;
$tbl_storage_engine = $table_class_object->getStorageEngine();
$show_comment = $table_class_object->getShowComment();
$show_comment = $table_class_object->getComment();
}
$tbl_collation = $table_class_object->getTableCollation();
$table_info_num_rows = $table_class_object->getTableNumRowInfo();

2
tbl_operations.php
View File

@ -222,7 +222,7 @@ if ($reread_info) {
} else {
$tbl_is_view = false;
$tbl_storage_engine = $pma_table->getStorageEngine();
$show_comment = $pma_table->getShowComment();
$show_comment = $pma_table->getComment();
}
$tbl_collation = $pma_table->getTableCollation();
$table_info_num_rows = $pma_table->getTableNumRowInfo();

6
test/classes/TableTest.php
View File

@ -1226,11 +1226,11 @@ class TableTest extends PMATestCase
}
/**
* Test for getShowComment
* Test for getComment
*
* @return void
*/
public function testGetShowComment(){
public function testGetComment(){
$target_table = 'table1';
$target_db = 'pma_test';
$tbl_object = new Table($target_db, $target_table);
@ -1241,7 +1241,7 @@ class TableTest extends PMATestCase
$show_comment = $dbi->getTable(
$target_db,
$target_table
)->getShowComment();
)->getComment();
$this->assertEquals(
$expect,
$show_comment