From a85d9eaa2cb640f869859a5aa6cc2f008aa7fdbb Mon Sep 17 00:00:00 2001 From: Kasun Chathuranga Date: Tue, 30 Apr 2013 23:29:55 +0530 Subject: [PATCH] PMA_DBI_get_tables --> PMA_DBI_getTables --- db_datadict.php | 2 +- export.php | 2 +- libraries/DbSearch.class.php | 2 +- libraries/Menu.class.php | 2 +- libraries/database_interface.lib.php | 4 ++-- libraries/db_info.inc.php | 2 +- libraries/replication.inc.php | 4 ++-- libraries/rte/rte_main.inc.php | 2 +- libraries/rte/rte_triggers.lib.php | 2 +- sql.php | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/db_datadict.php b/db_datadict.php index 8744aa4a05..110574a019 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -57,7 +57,7 @@ if ($cfgRelation['commwork']) { * Selects the database and gets tables names */ PMA_DBI_select_db($db); -$tables = PMA_DBI_get_tables($db); +$tables = PMA_DBI_getTables($db); $count = 0; foreach ($tables as $table) { diff --git a/export.php b/export.php index 53574eaf0b..c257a5fe67 100644 --- a/export.php +++ b/export.php @@ -648,7 +648,7 @@ do { $export_plugin->exportRoutines($current_db); } - $tables = PMA_DBI_get_tables($current_db); + $tables = PMA_DBI_getTables($current_db); $views = array(); foreach ($tables as $table) { // if this is a view, collect it for later; diff --git a/libraries/DbSearch.class.php b/libraries/DbSearch.class.php index 9ffd1d802b..2590745fbb 100644 --- a/libraries/DbSearch.class.php +++ b/libraries/DbSearch.class.php @@ -92,7 +92,7 @@ class PMA_DbSearch */ private function _setSearchParams() { - $this->_tables_names_only = PMA_DBI_get_tables($this->_db); + $this->_tables_names_only = PMA_DBI_getTables($this->_db); $this->_searchTypes = array( '1' => __('at least one of the words'), diff --git a/libraries/Menu.class.php b/libraries/Menu.class.php index d954616f44..124777c083 100644 --- a/libraries/Menu.class.php +++ b/libraries/Menu.class.php @@ -330,7 +330,7 @@ class PMA_Menu private function _getDbTabs() { $db_is_information_schema = PMA_is_system_schema($this->_db); - $num_tables = count(PMA_DBI_get_tables($this->_db)); + $num_tables = count(PMA_DBI_getTables($this->_db)); $is_superuser = PMA_isSuperuser(); /** diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index eda2b9a961..a6a88befb6 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -340,7 +340,7 @@ function PMA_DBI_convertMessage($message) * * @return array tables names */ -function PMA_DBI_get_tables($database, $link = null) +function PMA_DBI_getTables($database, $link = null) { return PMA_DBI_fetch_result( 'SHOW TABLES FROM ' . PMA_Util::backquote($database) . ';', @@ -1130,7 +1130,7 @@ function PMA_DBI_get_columns_full($database = null, $table = null, } return $columns; } elseif (null === $table) { - $tables = PMA_DBI_get_tables($database); + $tables = PMA_DBI_getTables($database); foreach ($tables as $table) { $columns[$table] = PMA_DBI_get_columns_full( $database, $table, null, $link diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php index 28230dcb9a..9b53808685 100644 --- a/libraries/db_info.inc.php +++ b/libraries/db_info.inc.php @@ -170,7 +170,7 @@ if (! isset($sot_ready)) { // all tables in db // - get the total number of tables // (needed for proper working of the MaxTableList feature) - $tables = PMA_DBI_get_tables($db); + $tables = PMA_DBI_getTables($db); $total_num_tables = count($tables); if (isset($sub_part) && $sub_part == '_export') { // (don't fetch only a subset if we are coming from db_export.php, diff --git a/libraries/replication.inc.php b/libraries/replication.inc.php index bdc34df6e4..624d8b864e 100644 --- a/libraries/replication.inc.php +++ b/libraries/replication.inc.php @@ -324,9 +324,9 @@ function PMA_replication_synchronize_db($db, $src_link, $trg_link, $data = true) { $src_db = $trg_db = $db; - $src_tables = PMA_DBI_get_tables($src_db, $src_link); + $src_tables = PMA_DBI_getTables($src_db, $src_link); - $trg_tables = PMA_DBI_get_tables($trg_db, $trg_link); + $trg_tables = PMA_DBI_getTables($trg_db, $trg_link); /** * initializing arrays to save table names diff --git a/libraries/rte/rte_main.inc.php b/libraries/rte/rte_main.inc.php index 355240f705..ae3e63ea4f 100644 --- a/libraries/rte/rte_main.inc.php +++ b/libraries/rte/rte_main.inc.php @@ -22,7 +22,7 @@ if ($GLOBALS['is_ajax_request'] != true) { /** * Displays the header and tabs */ - if (! empty($table) && in_array($table, PMA_DBI_get_tables($db))) { + if (! empty($table) && in_array($table, PMA_DBI_getTables($db))) { include_once './libraries/tbl_common.inc.php'; } else { $table = ''; diff --git a/libraries/rte/rte_triggers.lib.php b/libraries/rte/rte_triggers.lib.php index 3d373c95ad..e2100b8330 100644 --- a/libraries/rte/rte_triggers.lib.php +++ b/libraries/rte/rte_triggers.lib.php @@ -467,7 +467,7 @@ function PMA_TRI_getQueryFromRequest() } $query .= 'ON '; if (! empty($_REQUEST['item_table']) - && in_array($_REQUEST['item_table'], PMA_DBI_get_tables($db)) + && in_array($_REQUEST['item_table'], PMA_DBI_getTables($db)) ) { $query .= PMA_Util::backquote($_REQUEST['item_table']); } else { diff --git a/sql.php b/sql.php index 793d13ed29..b3b25345ac 100644 --- a/sql.php +++ b/sql.php @@ -1480,7 +1480,7 @@ function getTableHtmlForMultipleQueries( ) { $table_html = ''; - $tables_array = PMA_DBI_get_tables($db); + $tables_array = PMA_DBI_getTables($db); $databases_array = PMA_DBI_get_databases_full(); $multi_sql = implode(";", $sql_data['valid_sql']); $querytime_before = array_sum(explode(' ', microtime()));