diff --git a/libraries/Footer.class.php b/libraries/Footer.class.php index d999d16092..074134434b 100644 --- a/libraries/Footer.class.php +++ b/libraries/Footer.class.php @@ -61,6 +61,7 @@ class PMA_Footer $this->_scripts = new PMA_Scripts(); $this->_isMinimal = false; $this->_addDefaultScripts(); + unset($POST); } /** diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 7d34dbbd60..c94d8ae4ca 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -445,7 +445,7 @@ function PMA_DBI_get_tables_full($database, $table = false, // added BINARY in the WHERE clause to force a case sensitive // comparison (if we are looking for the db Aa we don't want // to find the db aa) - $this_databases = array_map('sqlAddSlashes', $databases); + $this_databases = array_map('PMA_Util::sqlAddSlashes', $databases); if (PMA_DRIZZLE) { $engine_info = PMA_Util::cacheGet('drizzle_engines', true); diff --git a/libraries/dbi/dummy.lib.php b/libraries/dbi/dummy.lib.php index fa06c3706b..83d92132bc 100644 --- a/libraries/dbi/dummy.lib.php +++ b/libraries/dbi/dummy.lib.php @@ -18,6 +18,18 @@ if (! defined('PHPMYADMIN')) { */ $GLOBALS['dummy_queries'] = array( array('query' => 'SELECT 1', 'result' => array(array('1'))), + array( + 'query' => 'SELECT CURRENT_USER();', + 'result' => array(array('pma_test@localhost')), + ), + array( + 'query' => 'SELECT COUNT(*) FROM mysql.user', + 'result' => false, + ), + array( + 'query' => 'SHOW MASTER LOGS', + 'result' => false, + ), array( 'query' => 'SHOW STORAGE ENGINES', 'result' => array( @@ -160,8 +172,49 @@ $GLOBALS['dummy_queries'] = array( array('o', 'text/plain', 'sql'), ) ), -); + array( + 'query' => 'SELECT TABLE_NAME FROM information_schema.VIEWS WHERE TABLE_SCHEMA = \'pma_test\' AND TABLE_NAME = \'table1\'', + 'result' => array(), + ), + array( + 'query' => 'SELECT *, `TABLE_SCHEMA` AS `Db`, `TABLE_NAME` AS `Name`, `TABLE_TYPE` AS `TABLE_TYPE`, `ENGINE` AS `Engine`, `ENGINE` AS `Type`, `VERSION` AS `Version`, `ROW_FORMAT` AS `Row_format`, `TABLE_ROWS` AS `Rows`, `AVG_ROW_LENGTH` AS `Avg_row_length`, `DATA_LENGTH` AS `Data_length`, `MAX_DATA_LENGTH` AS `Max_data_length`, `INDEX_LENGTH` AS `Index_length`, `DATA_FREE` AS `Data_free`, `AUTO_INCREMENT` AS `Auto_increment`, `CREATE_TIME` AS `Create_time`, `UPDATE_TIME` AS `Update_time`, `CHECK_TIME` AS `Check_time`, `TABLE_COLLATION` AS `Collation`, `CHECKSUM` AS `Checksum`, `CREATE_OPTIONS` AS `Create_options`, `TABLE_COMMENT` AS `Comment` FROM `information_schema`.`TABLES` t WHERE BINARY `TABLE_SCHEMA` IN (\'pma_test\') AND t.`TABLE_NAME` = \'table1\' ORDER BY Name ASC', + 'columns' => array('TABLE_CATALOG', 'TABLE_SCHEMA', 'TABLE_NAME', 'TABLE_TYPE', 'ENGINE', 'VERSION', 'ROW_FORMAT', 'TABLE_ROWS', 'AVG_ROW_LENGTH', 'DATA_LENGTH', 'MAX_DATA_LENGTH', 'INDEX_LENGTH', 'DATA_FREE', 'AUTO_INCREMENT', 'CREATE_TIME', 'UPDATE_TIME', 'CHECK_TIME', 'TABLE_COLLATION', 'CHECKSUM', 'CREATE_OPTIONS', 'TABLE_COMMENT', 'Db', 'Name', 'TABLE_TYPE', 'Engine', 'Type', 'Version', 'Row_format', 'Rows', 'Avg_row_length', 'Data_length', 'Max_data_length', 'Index_length', 'Data_free', 'Auto_increment', 'Create_time', 'Update_time', 'Check_time', 'Collation', 'Checksum', 'Create_options', 'Comment'), + 'result' => array( + array('def', 'smash', 'issues_issue', 'BASE TABLE', 'InnoDB', '10', 'Compact', '9136', '862', '7880704', '0', '1032192', '420478976', '155862', '2012-08-29 13:28:28', 'NULL', 'NULL', 'utf8_general_ci', 'NULL', '', '', 'smash', 'issues_issue', 'BASE TABLE', 'InnoDB', 'InnoDB', '10', 'Compact', '9136', '862', '7880704', '0', '1032192', '420478976', '155862', '2012-08-29 13:28:28', 'NULL', 'NULL', 'utf8_general_ci', 'NULL'), + ), + ), + array( + 'query' => 'SELECT COUNT(*) FROM `pma_test`.`table1`', + 'result' => array(array(0)), + ), + array( + 'query' => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.`USER_PRIVILEGES` WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\' AND PRIVILEGE_TYPE=\'TRIGGER\'', + 'result' => array(), + ), + array( + 'query' => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.`SCHEMA_PRIVILEGES` WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\' AND PRIVILEGE_TYPE=\'TRIGGER\' AND TABLE_SCHEMA=\'pma\\\\_test\'', + 'result' => array(), + ), + array( + 'query' => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.`TABLE_PRIVILEGES` WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\' AND PRIVILEGE_TYPE=\'TRIGGER\' AND TABLE_SCHEMA=\'pma\\\\_test\' AND TABLE_NAME=\'table1\'', + 'result' => array(), + ), + array( + 'query' => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.`USER_PRIVILEGES` WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\' AND PRIVILEGE_TYPE=\'EVENT\'', + 'result' => array(), + ), + array( + 'query' => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.`SCHEMA_PRIVILEGES` WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\' AND PRIVILEGE_TYPE=\'EVENT\' AND TABLE_SCHEMA=\'pma\\\\_test\'', + + 'result' => array(), + ), + array( + 'query' => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.`TABLE_PRIVILEGES` WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\' AND PRIVILEGE_TYPE=\'EVENT\' AND TABLE_SCHEMA=\'pma\\\\_test\' AND TABLE_NAME=\'table1\'', + 'result' => array(), + ), + +); /** * Current database. */ diff --git a/tbl_tracking.php b/tbl_tracking.php index e75df7f7a3..6ead489b2b 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -504,7 +504,7 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { . '' - ''; + . ''; $str2 = ''; $str3 = '
-
+
Inside tables:Select All  / Unselect AllInside column:

', $this->object->getSelectionForm($url_params) ); diff --git a/test/classes/PMA_Footer_test.php b/test/classes/PMA_Footer_test.php index c970ee1c4d..c028c508b7 100644 --- a/test/classes/PMA_Footer_test.php +++ b/test/classes/PMA_Footer_test.php @@ -1,6 +1,6 @@ object = new PMA_Footer(); unset($GLOBALS['error_message']); unset($GLOBALS['sql_query']); + $GLOBALS['error_handler'] = new PMA_Error_Handler(); } /** @@ -81,6 +91,8 @@ class PMA_Footer_test extends PHPUnit_Framework_TestCase /** * Test for _getDebugMessage * + * @return void + * * @group medium */ public function testGetDebugMessage() @@ -110,6 +122,8 @@ class PMA_Footer_test extends PHPUnit_Framework_TestCase /** * Test for _getSelfLink + * + * @return void */ public function testGetSelfLink() { @@ -128,6 +142,8 @@ class PMA_Footer_test extends PHPUnit_Framework_TestCase /** * Test for _getSelfLink + * + * @return void */ public function testGetSelfLinkWithImage() { @@ -146,32 +162,32 @@ class PMA_Footer_test extends PHPUnit_Framework_TestCase ); } -// /** -// * Test for disable -// */ -// public function testDisable() -// { -// -// $GLOBALS['lang'] = 'en'; -// $GLOBALS['collation_connection'] = 'utf8_general_ci'; -// $GLOBALS['server'] = '1'; -// $_SESSION[' PMA_token '] = 'token'; -// $GLOBALS['reload'] = '1'; -// $GLOBALS['focus_querywindow'] = 'main_pane_left'; -// -// $footer = new PMA_Footer(); -// -// $class = get_class( $footer ); -// $reflection = new ReflectionClass( $class ); -// $priv_attr = $reflection->getProperties( ReflectionProperty::IS_PRIVATE ); -// $privates = array(); -// $parseable = unserialize(str_replace("\0$class\0", "\0*\0", serialize($footer))); -// foreach($priv_attr as $attribute) -// { -// $aname = $attribute->name; -// $privates[$aname] = $parseable->$aname; -// } -// -// $this->assertFalse($priv_attr[3]->_isEnable); -// } + /** + * Test for disable + * + * @return void + */ + public function testDisable() + { + $footer = new PMA_Footer(); + $footer->disable(); + $this->assertEquals( + '', + $footer->getDisplay() + ); + } + + /** + * Test for displaying footer + * + * @return void + */ + public function testDisplay() + { + $footer = new PMA_Footer(); + $this->assertContains( + 'Open new phpMyAdmin window', + $footer->getDisplay() + ); + } } diff --git a/test/classes/PMA_Menu_test.php b/test/classes/PMA_Menu_test.php new file mode 100644 index 0000000000..11bca4b031 --- /dev/null +++ b/test/classes/PMA_Menu_test.php @@ -0,0 +1,104 @@ +getPath(); + $GLOBALS['pmaThemeImage'] = 'theme/'; + $GLOBALS['cfg']['DefaultTabServer'] = 'main.php'; + $GLOBALS['cfg']['DefaultTabDatabase'] = 'db_structure.php'; + $GLOBALS['cfg']['DefaultTabTable'] = 'sql.php'; + $GLOBALS['cfg']['OBGzip'] = false; + $GLOBALS['cfg']['NaturalOrder'] = true; + $GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF'); + $GLOBALS['server'] = 'server'; + $GLOBALS['db'] = 'pma_test'; + $GLOBALS['table'] = 'table1'; + } + + /** + * Server menu test + * + * @return void + */ + function testServer() + { + $menu = new PMA_Menu('server', '', ''); + $this->assertContains( + 'floating_menubar', + $menu->getDisplay() + ); + } + + /** + * Database menu test + * + * @return void + */ + function testDatabase() + { + $menu = new PMA_Menu('server', 'pma_test', ''); + $this->assertContains( + 'floating_menubar', + $menu->getDisplay() + ); + } + + /** + * Table menu test + * + * @return void + */ + function testTable() + { + $menu = new PMA_Menu('server', 'pma_test', 'table1'); + $this->assertContains( + 'floating_menubar', + $menu->getDisplay() + ); + } + +} diff --git a/test/classes/PMA_Types_Drizzle_test.php b/test/classes/PMA_Types_Drizzle_test.php index 16e8480c9e..2c654e13f8 100644 --- a/test/classes/PMA_Types_Drizzle_test.php +++ b/test/classes/PMA_Types_Drizzle_test.php @@ -322,11 +322,6 @@ class PMA_Types_Drizzle_test extends PHPUnit_Framework_TestCase */ public function testGetColumns() { - - if (! defined('PMA_MYSQL_INT_VERSION')) { - define('PMA_MYSQL_INT_VERSION', 20120130); - } - $this->assertEquals( array( 0 => 'INT', @@ -358,8 +353,6 @@ class PMA_Types_Drizzle_test extends PHPUnit_Framework_TestCase 'BLOB', '-', 'ENUM', - '-', - 'IPV6' ), ), $this->object->getColumns() diff --git a/test/classes/PMA_Types_MySQL_test.php b/test/classes/PMA_Types_MySQL_test.php index bdca3b4ac5..11d7afce28 100644 --- a/test/classes/PMA_Types_MySQL_test.php +++ b/test/classes/PMA_Types_MySQL_test.php @@ -285,11 +285,6 @@ class PMA_Types_MySQL_Test extends PHPUnit_Framework_TestCase */ public function testGetFunctionsClass($class, $output) { - - if (! defined('PMA_MYSQL_INT_VERSION')) { - define('PMA_MYSQL_INT_VERSION', 60000); - } - $this->assertEquals( $output, $this->object->getFunctionsClass($class) diff --git a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php index f64d99a0b6..11b526ed4c 100644 --- a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php +++ b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php @@ -23,11 +23,6 @@ class PMA_RTN_getExecuteForm_test extends PHPUnit_Framework_TestCase public function setUp() { global $cfg; - - if (! defined('PMA_MYSQL_INT_VERSION')) { - define('PMA_MYSQL_INT_VERSION', 55000); - } - $GLOBALS['PMA_Types'] = new PMA_Types_MySQL(); $GLOBALS['server'] = 0; $cfg['ServerDefault'] = 1;