From 03fc9b92565e9946512a1ca8151f5b006c321b2c Mon Sep 17 00:00:00 2001 From: Kasun Chathuranga Date: Sun, 12 May 2013 08:51:54 +0530 Subject: [PATCH] PMA_is_system_schema --> PMA_isSystemSchema --- db_operations.php | 2 +- libraries/List.class.php | 2 +- libraries/Menu.class.php | 4 ++-- libraries/Table.class.php | 2 +- libraries/Util.class.php | 2 +- libraries/build_html_for_db.lib.php | 2 +- libraries/database_interface.lib.php | 2 +- libraries/db_common.inc.php | 2 +- libraries/db_info.inc.php | 2 +- libraries/mysql_charsets.lib.php | 2 +- libraries/replication.inc.php | 2 +- libraries/replication_gui.lib.php | 2 +- libraries/tbl_common.inc.php | 2 +- server_databases.php | 2 +- sql.php | 4 ++-- tbl_printview.php | 2 +- test/libraries/database_interface_test.php | 2 +- 17 files changed, 19 insertions(+), 19 deletions(-) diff --git a/db_operations.php b/db_operations.php index 4f4d1b14a6..f1f072466b 100644 --- a/db_operations.php +++ b/db_operations.php @@ -206,7 +206,7 @@ if (empty($is_info)) { } $_REQUEST['db_collation'] = PMA_getDbCollation($db); -$is_information_schema = PMA_is_system_schema($db); +$is_information_schema = PMA_isSystemSchema($db); if (!$is_information_schema) { if ($cfgRelation['commwork']) { diff --git a/libraries/List.class.php b/libraries/List.class.php index f87c89dfff..1a0e644f67 100644 --- a/libraries/List.class.php +++ b/libraries/List.class.php @@ -87,7 +87,7 @@ abstract class PMA_List extends ArrayObject $options = ''; foreach ($this as $each_item) { if (false === $include_information_schema - && PMA_is_system_schema($each_item) + && PMA_isSystemSchema($each_item) ) { continue; } diff --git a/libraries/Menu.class.php b/libraries/Menu.class.php index fb07d023a2..96e8085456 100644 --- a/libraries/Menu.class.php +++ b/libraries/Menu.class.php @@ -240,7 +240,7 @@ class PMA_Menu */ private function _getTableTabs() { - $db_is_information_schema = PMA_is_system_schema($this->_db); + $db_is_information_schema = PMA_isSystemSchema($this->_db); $tbl_is_view = PMA_Table::isView($this->_db, $this->_table); $table_info_num_rows = PMA_Table::countRecords($this->_db, $this->_table); @@ -325,7 +325,7 @@ class PMA_Menu */ private function _getDbTabs() { - $db_is_information_schema = PMA_is_system_schema($this->_db); + $db_is_information_schema = PMA_isSystemSchema($this->_db); $num_tables = count(PMA_DBI_getTables($this->_db)); $is_superuser = PMA_isSuperuser(); diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 9eed857556..377308783e 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -525,7 +525,7 @@ class PMA_Table // Make an exception for views in I_S and D_D schema in // Drizzle, as these map to in-memory data and should execute // fast enough - if (! $is_view || (PMA_DRIZZLE && PMA_is_system_schema($db))) { + if (! $is_view || (PMA_DRIZZLE && PMA_isSystemSchema($db))) { $row_count = PMA_DBI_fetchValue( 'SELECT COUNT(*) FROM ' . PMA_Util::backquote($db) . '.' . PMA_Util::backquote($table) diff --git a/libraries/Util.class.php b/libraries/Util.class.php index 4a416df0bc..59cc1bc50f 100644 --- a/libraries/Util.class.php +++ b/libraries/Util.class.php @@ -823,7 +823,7 @@ class PMA_Util // set this because PMA_Table::countRecords() can use it $tbl_is_view = $table['TABLE_TYPE'] == 'VIEW'; - if ($tbl_is_view || PMA_is_system_schema($db)) { + if ($tbl_is_view || PMA_isSystemSchema($db)) { $table['Rows'] = PMA_Table::countRecords( $db, $table['Name'], diff --git a/libraries/build_html_for_db.lib.php b/libraries/build_html_for_db.lib.php index 21602cc2a9..93bc473f32 100644 --- a/libraries/build_html_for_db.lib.php +++ b/libraries/build_html_for_db.lib.php @@ -81,7 +81,7 @@ function PMA_buildHtmlForDb( . 'title="' . htmlspecialchars($current['SCHEMA_NAME']) . '" ' . 'value="' . htmlspecialchars($current['SCHEMA_NAME']) . '"'; - if (PMA_is_system_schema($current['SCHEMA_NAME'], true)) { + if (PMA_isSystemSchema($current['SCHEMA_NAME'], true)) { $out .= ' disabled="disabled"'; } $out .= ' />'; diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index a973cad574..abf8205ce3 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -2092,7 +2092,7 @@ function PMA_DBI_formatError($error_number, $error_message) * * @return bool */ -function PMA_is_system_schema($schema_name, $test_for_mysql_schema = false) +function PMA_isSystemSchema($schema_name, $test_for_mysql_schema = false) { return strtolower($schema_name) == 'information_schema' || (!PMA_DRIZZLE && strtolower($schema_name) == 'performance_schema') diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php index 2551f22ae2..c9c260a598 100644 --- a/libraries/db_common.inc.php +++ b/libraries/db_common.inc.php @@ -18,7 +18,7 @@ PMA_Util::checkParameters(array('db')); $is_show_stats = $cfg['ShowStats']; -$db_is_information_schema = PMA_is_system_schema($db); +$db_is_information_schema = PMA_isSystemSchema($db); if ($db_is_information_schema) { $is_show_stats = false; } diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php index 2deeabaf10..0af60a507d 100644 --- a/libraries/db_info.inc.php +++ b/libraries/db_info.inc.php @@ -41,7 +41,7 @@ $is_show_stats = $cfg['ShowStats']; */ $db_is_information_schema = false; -if (PMA_is_system_schema($db)) { +if (PMA_isSystemSchema($db)) { $is_show_stats = false; $db_is_information_schema = true; } diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php index 39ff57916a..649fca9928 100644 --- a/libraries/mysql_charsets.lib.php +++ b/libraries/mysql_charsets.lib.php @@ -186,7 +186,7 @@ function PMA_generateCharsetQueryPart($collation) */ function PMA_getDbCollation($db) { - if (PMA_is_system_schema($db)) { + if (PMA_isSystemSchema($db)) { // We don't have to check the collation of the virtual // information_schema database: We know it! return 'utf8_general_ci'; diff --git a/libraries/replication.inc.php b/libraries/replication.inc.php index e0c77f951d..1fb5270239 100644 --- a/libraries/replication.inc.php +++ b/libraries/replication.inc.php @@ -286,7 +286,7 @@ function PMA_replication_master_replicated_dbs($link = null) $tmp_alldbs = PMA_DBI_query('SHOW DATABASES;', $link); while ($tmp_row = PMA_DBI_fetchRow($tmp_alldbs)) { - if (PMA_is_system_schema($tmp_row[0])) { + if (PMA_isSystemSchema($tmp_row[0])) { continue; } if (count($do_db) == 0) { diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php index 363d63b65e..2142fab601 100644 --- a/libraries/replication_gui.lib.php +++ b/libraries/replication_gui.lib.php @@ -19,7 +19,7 @@ function PMA_replication_db_multibox() $multi_values .= '