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

Simplify getting storage engine

Browse Source 
- remove not needed word Table from method name
- fix code to handle errors
- convert existing users of getStatusInfo('ENGINE') to this method

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

9
libraries/Table.php
View File

@ -172,9 +172,7 @@ class Table
*/
public function isEngine($engine)
{
$tbl_storage_engine = strtoupper(
$this->getStatusInfo('ENGINE', false, true)
);
$tbl_storage_engine = $this->getStorageEngine();
if (is_array($engine)){
foreach($engine as $e){
@ -327,11 +325,12 @@ class Table
* @return string Return storage engine info if it is set for
* the selected table else return blank.
*/
public function getTableStorageEngine() {
public function getStorageEngine() {
$table_storage_engine = $this->getStatusInfo('ENGINE', false, true);
if ($table_storage_engine === false) {
return isset($table_storage_engine)? mb_strtoupper($table_storage_engine): '';
return '';
}
return strtoupper($table_storage_engine);
}
/**

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

@ -127,7 +127,7 @@ class TableChartController extends TableController
$show_comment = null;
} else {
$tbl_is_view = false;
$tbl_storage_engine = $table_class_object->getTableStorageEngine();
$tbl_storage_engine = $table_class_object->getStorageEngine();
$show_comment = $table_class_object->getShowComment();
}
$tbl_collation = $table_class_object->getTableCollation();

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

@ -75,7 +75,7 @@ class TableIndexesController extends TableController
$show_comment = null;
} else {
$tbl_is_view = false;
$tbl_storage_engine = $table_class_object->getTableStorageEngine();
$tbl_storage_engine = $table_class_object->getStorageEngine();
$show_comment = $table_class_object->getShowComment();
}
$tbl_collation = $table_class_object->getTableCollation();

3
libraries/controllers/table/TableRelationController.php
View File

@ -146,8 +146,7 @@ class TableRelationController extends TableController
}
// display secondary level tabs if necessary
$engine = $this->dbi->getTable($this->db, $this->table)
->getStatusInfo('ENGINE');
$engine = $this->dbi->getTable($this->db, $this->table)->getStorageEngine();
$this->response->addHTML(
Template::get('table/secondary_tabs')->render(

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

@ -252,7 +252,7 @@ class TableStructureController extends TableController
}
// display secondary level tabs if necessary
$engine = $this->table_obj->getStatusInfo('ENGINE');
$engine = $this->table_obj->getStorageEngine();
$this->response->addHTML(
Template::get('table/secondary_tabs')->render(
array(

2
tbl_operations.php
View File

@ -221,7 +221,7 @@ if ($reread_info) {
$show_comment = null;
} else {
$tbl_is_view = false;
$tbl_storage_engine = $pma_table->getTableStorageEngine();
$tbl_storage_engine = $pma_table->getStorageEngine();
$show_comment = $pma_table->getShowComment();
}
$tbl_collation = $pma_table->getTableCollation();

6
test/classes/TableTest.php
View File

@ -1203,11 +1203,11 @@ class TableTest extends PMATestCase
}
/**
* Test for getTableStorageEngine
* Test for getStorageEngine
*
* @return void
*/
public function testGetTableStorageEngine(){
public function testGetStorageEngine(){
$target_table = 'table1';
$target_db = 'pma_test';
$tbl_object = new Table($target_db, $target_table);
@ -1218,7 +1218,7 @@ class TableTest extends PMATestCase
$tbl_storage_engine = $dbi->getTable(
$target_db,
$target_table
)->getTableStorageEngine();
)->getStorageEngine();
$this->assertEquals(
$expect,
$tbl_storage_engine