From 968f9092b0b5af562e1e200387dbe915e072575c Mon Sep 17 00:00:00 2001 From: Brad Jorgensen Date: Fri, 3 May 2013 14:17:24 -0500 Subject: [PATCH 01/36] added missing tag removed (int) check which caused issues with large numbers on 32-bit systems --- server_status_variables.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/server_status_variables.php b/server_status_variables.php index 93dc968ffb..bed412f1df 100644 --- a/server_status_variables.php +++ b/server_status_variables.php @@ -270,14 +270,13 @@ function getVariablesTableHtml($ServerStatusData) $retval .= htmlspecialchars( PMA_Util::timespanFormat($value) ); - } elseif (is_numeric($value) && $value == (int) $value && $value > 1000) { + } elseif (is_numeric($value) && $value > 1000) { $retval .= '' - . htmlspecialchars(PMA_Util::formatNumber($value, 3, 1)); - } elseif (is_numeric($value) && $value == (int) $value) { - $retval .= htmlspecialchars(PMA_Util::formatNumber($value, 3, 0)); + . htmlspecialchars(PMA_Util::formatNumber($value, 3, 1)) + . ''; } elseif (is_numeric($value)) { $retval .= htmlspecialchars(PMA_Util::formatNumber($value, 3, 1)); } else { From 16a58669d6fd957544413cde3f6915cde4cf767f Mon Sep 17 00:00:00 2001 From: Kasun Chathuranga Date: Sat, 4 May 2013 08:23:50 +0530 Subject: [PATCH 02/36] PMA_DBI_real_connect --> PMA_DBI_realConnect --- libraries/Error.class.php | 2 +- libraries/dbi/drizzle.dbi.lib.php | 8 ++++---- libraries/dbi/mysql.dbi.lib.php | 10 +++++----- libraries/dbi/mysqli.dbi.lib.php | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/libraries/Error.class.php b/libraries/Error.class.php index e2c013328a..354f86598f 100644 --- a/libraries/Error.class.php +++ b/libraries/Error.class.php @@ -306,7 +306,7 @@ class PMA_Error extends PMA_Message 'mysqli_connect', 'mysqli_real_connect', 'PMA_DBI_connect', - 'PMA_DBI_real_connect', + 'PMA_DBI_realConnect', ); if (in_array($function, $include_functions)) { diff --git a/libraries/dbi/drizzle.dbi.lib.php b/libraries/dbi/drizzle.dbi.lib.php index a2d60491f4..51614de88e 100644 --- a/libraries/dbi/drizzle.dbi.lib.php +++ b/libraries/dbi/drizzle.dbi.lib.php @@ -42,7 +42,7 @@ if (!defined('PMA_MYSQL_CLIENT_API')) { * * @return PMA_DrizzleCon */ -function PMA_DBI_real_connect($drizzle, $host, $port, $uds, $user, $password, +function PMA_DBI_realConnect($drizzle, $host, $port, $uds, $user, $password, $db = null, $options = DRIZZLE_CON_NONE ) { if ($uds) { @@ -109,7 +109,7 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, } if (! $server) { - $link = @PMA_DBI_real_connect( + $link = @PMA_DBI_realConnect( $drizzle, $cfg['Server']['host'], $server_port, $server_socket, $user, $password, false, $client_flags ); @@ -117,13 +117,13 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, if ($link == false && isset($cfg['Server']['nopassword']) && $cfg['Server']['nopassword'] && ! $is_controluser ) { - $link = @PMA_DBI_real_connect( + $link = @PMA_DBI_realConnect( $drizzle, $cfg['Server']['host'], $server_port, $server_socket, $user, null, false, $client_flags ); } } else { - $link = @PMA_DBI_real_connect( + $link = @PMA_DBI_realConnect( $drizzle, $server['host'], $server_port, $server_socket, $user, $password ); diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index 398ae206c9..0dfe2e3554 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -38,7 +38,7 @@ if (! defined('PMA_MYSQL_CLIENT_API')) { * * @return mixed false on error or a mysql connection resource on success */ -function PMA_DBI_real_connect($server, $user, $password, $client_flags, +function PMA_DBI_realConnect($server, $user, $password, $client_flags, $persistent = false ) { global $cfg; @@ -130,23 +130,23 @@ function PMA_DBI_connect( } if (! $server) { - $link = PMA_DBI_real_connect( + $link = PMA_DBI_realConnect( $cfg['Server']['host'] . $server_port . $server_socket, $user, $password, empty($client_flags) ? null : $client_flags ); // Retry with empty password if we're allowed to if (empty($link) && $cfg['Server']['nopassword'] && ! $is_controluser) { - $link = PMA_DBI_real_connect( + $link = PMA_DBI_realConnect( $cfg['Server']['host'] . $server_port . $server_socket, $user, '', empty($client_flags) ? null : $client_flags ); } } else { if (!isset($server['host'])) { - $link = PMA_DBI_real_connect($server_socket, $user, $password, null); + $link = PMA_DBI_realConnect($server_socket, $user, $password, null); } else { - $link = PMA_DBI_real_connect( + $link = PMA_DBI_realConnect( $server['host'] . $server_port . $server_socket, $user, $password, null ); diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 718c985bae..30385c528e 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -70,7 +70,7 @@ if (! defined('MYSQLI_TYPE_VARCHAR')) { * * @return bool */ -function PMA_DBI_real_connect( +function PMA_DBI_realConnect( $link, $host, $user, $password, $dbname, $server_port, $server_socket, $client_flags = null, $persistent = false ) { @@ -162,7 +162,7 @@ function PMA_DBI_connect( } if (! $server) { - $return_value = @PMA_DBI_real_connect( + $return_value = @PMA_DBI_realConnect( $link, $cfg['Server']['host'], $user, @@ -177,7 +177,7 @@ function PMA_DBI_connect( && isset($cfg['Server']['nopassword']) && $cfg['Server']['nopassword'] && ! $is_controluser ) { - $return_value = @PMA_DBI_real_connect( + $return_value = @PMA_DBI_realConnect( $link, $cfg['Server']['host'], $user, @@ -189,7 +189,7 @@ function PMA_DBI_connect( ); } } else { - $return_value = @PMA_DBI_real_connect( + $return_value = @PMA_DBI_realConnect( $link, $server['host'], $user, From 85e16d8bdc641a0d99d5c0fb6894f6130ac52e63 Mon Sep 17 00:00:00 2001 From: Kasun Chathuranga Date: Sat, 4 May 2013 08:24:57 +0530 Subject: [PATCH 03/36] PMA_DBI_real_multi_query --> PMA_DBI_realMultiQuery --- libraries/database_interface.lib.php | 2 +- libraries/dbi/dummy.lib.php | 2 +- libraries/dbi/mysql.dbi.lib.php | 2 +- libraries/dbi/mysqli.dbi.lib.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 2f7031d65d..9c8c42d8f2 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -225,7 +225,7 @@ function PMA_DBI_tryMultiQuery($multi_query = '', $link = null) } } - return PMA_DBI_real_multi_query($link, $multi_query); + return PMA_DBI_realMultiQuery($link, $multi_query); } diff --git a/libraries/dbi/dummy.lib.php b/libraries/dbi/dummy.lib.php index d121d4fab9..d8827cfb2f 100644 --- a/libraries/dbi/dummy.lib.php +++ b/libraries/dbi/dummy.lib.php @@ -270,7 +270,7 @@ if (! defined('PMA_DRIZZLE')) { * @return boolean false always false since mysql extention not support * for multi query executions */ -function PMA_DBI_real_multi_query($link, $query) +function PMA_DBI_realMultiQuery($link, $query) { return false; } diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index 0dfe2e3554..b5b1ca2fa1 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -69,7 +69,7 @@ function PMA_DBI_realConnect($server, $user, $password, $client_flags, * @return boolean false always false since mysql extention not support * for multi query executions */ -function PMA_DBI_real_multi_query($link, $query) +function PMA_DBI_realMultiQuery($link, $query) { // N.B.: PHP's 'mysql' extension does not support // multi_queries so this function will always diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 30385c528e..957cf42489 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -275,7 +275,7 @@ function PMA_DBI_real_query($query, $link, $options) * * @return mysqli_result collection | boolean(false) */ -function PMA_DBI_real_multi_query($link, $query) +function PMA_DBI_realMultiQuery($link, $query) { return mysqli_multi_query($link, $query); } From 42256b2d0cdc1d405f34a20d2fcb4224f4545a40 Mon Sep 17 00:00:00 2001 From: Kasun Chathuranga Date: Sat, 4 May 2013 08:26:27 +0530 Subject: [PATCH 04/36] PMA_DBI_select_db --> PMA_DBI_selectDb --- db_datadict.php | 4 ++-- db_operations.php | 4 ++-- export.php | 2 +- import.php | 2 +- libraries/DBQbe.class.php | 2 +- libraries/Table.class.php | 6 +++--- libraries/db_common.inc.php | 2 +- libraries/db_table_exists.lib.php | 2 +- libraries/dbi/drizzle.dbi.lib.php | 2 +- libraries/dbi/dummy.lib.php | 2 +- libraries/dbi/mysql.dbi.lib.php | 2 +- libraries/dbi/mysqli.dbi.lib.php | 2 +- libraries/mult_submits.inc.php | 8 ++++---- libraries/mysql_charsets.lib.php | 4 ++-- libraries/operations.lib.php | 18 +++++++++--------- .../plugins/export/ExportHtmlword.class.php | 2 +- libraries/plugins/export/ExportLatex.class.php | 2 +- libraries/plugins/export/ExportOdt.class.php | 4 ++-- .../plugins/export/ExportTexytext.class.php | 4 ++-- libraries/pmd_common.php | 6 +++--- libraries/relation.lib.php | 2 +- libraries/rte/rte_main.inc.php | 2 +- libraries/schema/User_Schema.class.php | 2 +- libraries/server_common.inc.php | 2 +- libraries/structure.lib.php | 4 ++-- libraries/tbl_info.inc.php | 2 +- schema_export.php | 2 +- server_status_monitor.php | 2 +- sql.php | 2 +- tbl_addfield.php | 2 +- tbl_change.php | 2 +- tbl_create.php | 2 +- tbl_get_field.php | 2 +- tbl_move_copy.php | 2 +- tbl_operations.php | 4 ++-- tbl_printview.php | 2 +- tbl_replace.php | 2 +- transformation_wrapper.php | 2 +- user_password.php | 2 +- 39 files changed, 61 insertions(+), 61 deletions(-) diff --git a/db_datadict.php b/db_datadict.php index 9c6b0f3c0b..9b3c0ca8f3 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -56,7 +56,7 @@ if ($cfgRelation['commwork']) { /** * Selects the database and gets tables names */ -PMA_DBI_select_db($db); +PMA_DBI_selectDb($db); $tables = PMA_DBI_getTables($db); $count = 0; @@ -76,7 +76,7 @@ foreach ($tables as $table) { * Gets table keys and retains them */ - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); $indexes = PMA_DBI_getTableIndexes($db, $table); $primary = ''; $indexes = array(); diff --git a/db_operations.php b/db_operations.php index b31e456bef..4f4d1b14a6 100644 --- a/db_operations.php +++ b/db_operations.php @@ -62,7 +62,7 @@ if (strlen($db) PMA_runProcedureAndFunctionDefinitions($db); // go back to current db, just in case - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); $tables_full = PMA_DBI_getTablesFull($db); @@ -109,7 +109,7 @@ if (strlen($db) } // go back to current db, just in case - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); // Duplicate the bookmarks for this db (done once for each db) PMA_duplicateBookmarks($_error, $db); diff --git a/export.php b/export.php index 302b86752e..cfe18c594a 100644 --- a/export.php +++ b/export.php @@ -832,7 +832,7 @@ do { $sql_query = preg_replace('%;\s*$%', '', $sql_query); } $local_query = $sql_query . $add_query; - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); } else { $local_query = 'SELECT * FROM ' . PMA_Util::backquote($db) . '.' . PMA_Util::backquote($table) . $add_query; diff --git a/import.php b/import.php index 00ed893c0b..a81d716812 100644 --- a/import.php +++ b/import.php @@ -181,7 +181,7 @@ if ($import_type == 'table') { if (strlen($db)) { - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); } @set_time_limit($cfg['ExecTimeLimit']); diff --git a/libraries/DBQbe.class.php b/libraries/DBQbe.class.php index 216e9d29e7..b6e62e7fd2 100644 --- a/libraries/DBQbe.class.php +++ b/libraries/DBQbe.class.php @@ -1065,7 +1065,7 @@ class PMA_DbQbe private function _getLeftJoinColumnCandidates($all_tables, $all_columns, $where_clause_columns ) { - PMA_DBI_select_db($this->_db); + PMA_DBI_selectDb($this->_db); $candidate_columns = array(); // Get unique columns and index columns diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 31a9a82e7d..acf00890d6 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -748,7 +748,7 @@ class PMA_Table // Doing a select_db could avoid some problems with replicated databases, // when moving table from replicated one to not replicated one - PMA_DBI_select_db($target_db); + PMA_DBI_selectDb($target_db); $target = PMA_Util::backquote($target_db) . '.' . PMA_Util::backquote($target_table); @@ -936,7 +936,7 @@ class PMA_Table // This could avoid some problems with replicated databases, when // moving table from replicated one to not replicated one - PMA_DBI_select_db($source_db); + PMA_DBI_selectDb($source_db); if (PMA_Table::isView($source_db, $source_table)) { $sql_drop_query = 'DROP VIEW'; @@ -1201,7 +1201,7 @@ class PMA_Table if (! PMA_DBI_query($GLOBALS['sql_query'])) { // Restore triggers in the old database if ($handle_triggers) { - PMA_DBI_select_db($this->getDbName()); + PMA_DBI_selectDb($this->getDbName()); foreach ($triggers as $trigger) { PMA_DBI_query($trigger['create']); } diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php index 6cd4fc4688..2551f22ae2 100644 --- a/libraries/db_common.inc.php +++ b/libraries/db_common.inc.php @@ -36,7 +36,7 @@ $err_url = $cfg['DefaultTabDatabase'] . '?' . PMA_generate_common_url($db); */ if (! isset($is_db) || ! $is_db) { if (strlen($db)) { - $is_db = PMA_DBI_select_db($db); + $is_db = PMA_DBI_selectDb($db); // This "Command out of sync" 2014 error may happen, for example // after calling a MySQL procedure; at this point we can't select // the db but it's not necessarily wrong diff --git a/libraries/db_table_exists.lib.php b/libraries/db_table_exists.lib.php index 40ed7fe1be..8a7b50453f 100644 --- a/libraries/db_table_exists.lib.php +++ b/libraries/db_table_exists.lib.php @@ -12,7 +12,7 @@ if (! defined('PHPMYADMIN')) { if (empty($is_db)) { if (strlen($db)) { - $is_db = @PMA_DBI_select_db($db); + $is_db = @PMA_DBI_selectDb($db); } else { $is_db = false; } diff --git a/libraries/dbi/drizzle.dbi.lib.php b/libraries/dbi/drizzle.dbi.lib.php index 51614de88e..7500f47318 100644 --- a/libraries/dbi/drizzle.dbi.lib.php +++ b/libraries/dbi/drizzle.dbi.lib.php @@ -165,7 +165,7 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, * * @return bool */ -function PMA_DBI_select_db($dbname, $link = null) +function PMA_DBI_selectDb($dbname, $link = null) { if (empty($link)) { if (isset($GLOBALS['userlink'])) { diff --git a/libraries/dbi/dummy.lib.php b/libraries/dbi/dummy.lib.php index d8827cfb2f..91942370af 100644 --- a/libraries/dbi/dummy.lib.php +++ b/libraries/dbi/dummy.lib.php @@ -302,7 +302,7 @@ function PMA_DBI_connect( * * @return bool */ -function PMA_DBI_select_db($dbname, $link = null) +function PMA_DBI_selectDb($dbname, $link = null) { $GLOBALS['dummy_db'] = $dbname; return true; diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index b5b1ca2fa1..99b0a296e6 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -188,7 +188,7 @@ function PMA_DBI_connect( * * @return bool */ -function PMA_DBI_select_db($dbname, $link = null) +function PMA_DBI_selectDb($dbname, $link = null) { if (empty($link)) { if (isset($GLOBALS['userlink'])) { diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 957cf42489..432133a6ed 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -233,7 +233,7 @@ function PMA_DBI_connect( * * @return boolean */ -function PMA_DBI_select_db($dbname, $link = null) +function PMA_DBI_selectDb($dbname, $link = null) { if (empty($link)) { if (isset($GLOBALS['userlink'])) { diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 1c1ddbf7e1..c1aa449df2 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -86,7 +86,7 @@ if (! empty($submit_mult) break; case 'primary': // Gets table primary key - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); $result = PMA_DBI_query('SHOW KEYS FROM ' . PMA_Util::backquote($table) . ';'); $primary = ''; while ($row = PMA_DBI_fetch_assoc($result)) { @@ -365,7 +365,7 @@ if (!empty($submit_mult) && !empty($what)) { if ($query_type == 'primary_fld') { // Gets table primary key - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); $result = PMA_DBI_query('SHOW KEYS FROM ' . PMA_Util::backquote($table) . ';'); $primary = ''; while ($row = PMA_DBI_fetch_assoc($result)) { @@ -523,7 +523,7 @@ if (!empty($submit_mult) && !empty($what)) { if ($run_parts) { $sql_query .= $a_query . ';' . "\n"; if ($query_type != 'drop_db') { - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); } $result = PMA_DBI_query($a_query); @@ -551,7 +551,7 @@ if (!empty($submit_mult) && !empty($what)) { if ($use_sql) { include './sql.php'; } elseif (!$run_parts) { - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); // for disabling foreign key checks while dropping tables if (! isset($_REQUEST['fk_check']) && $query_type == 'drop_tbl') { PMA_DBI_query('SET FOREIGN_KEY_CHECKS = 0;'); diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php index 09ecf83685..cef00cf630 100644 --- a/libraries/mysql_charsets.lib.php +++ b/libraries/mysql_charsets.lib.php @@ -203,12 +203,12 @@ function PMA_getDbCollation($db) . '\' LIMIT 1'; return PMA_DBI_fetchValue($sql); } else { - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); $return = PMA_DBI_fetchValue( 'SHOW VARIABLES LIKE \'collation_database\'', 0, 1 ); if ($db !== $GLOBALS['db']) { - PMA_DBI_select_db($GLOBALS['db']); + PMA_DBI_selectDb($GLOBALS['db']); } return $return; } diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php index a5265ce82a..13bb4e4dbd 100644 --- a/libraries/operations.lib.php +++ b/libraries/operations.lib.php @@ -297,13 +297,13 @@ function PMA_runProcedureAndFunctionDefinitions($db) $procedure_names = PMA_DBI_getProceduresOrFunctions($db, 'PROCEDURE'); if ($procedure_names) { foreach ($procedure_names as $procedure_name) { - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); $tmp_query = PMA_DBI_getDefinition( $db, 'PROCEDURE', $procedure_name ); // collect for later display $GLOBALS['sql_query'] .= "\n" . $tmp_query; - PMA_DBI_select_db($_REQUEST['newname']); + PMA_DBI_selectDb($_REQUEST['newname']); PMA_DBI_query($tmp_query); } } @@ -311,11 +311,11 @@ function PMA_runProcedureAndFunctionDefinitions($db) $function_names = PMA_DBI_getProceduresOrFunctions($db, 'FUNCTION'); if ($function_names) { foreach ($function_names as $function_name) { - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); $tmp_query = PMA_DBI_getDefinition($db, 'FUNCTION', $function_name); // collect for later display $GLOBALS['sql_query'] .= "\n" . $tmp_query; - PMA_DBI_select_db($_REQUEST['newname']); + PMA_DBI_selectDb($_REQUEST['newname']); PMA_DBI_query($tmp_query); } } @@ -415,7 +415,7 @@ function PMA_getViewsAndCreateSqlViewStandIn( $sql_view_standin = $export_sql_plugin->getTableDefStandIn( $db, $each_table, "\n" ); - PMA_DBI_select_db($_REQUEST['newname']); + PMA_DBI_selectDb($_REQUEST['newname']); PMA_DBI_query($sql_view_standin); $GLOBALS['sql_query'] .= "\n" . $sql_view_standin; } @@ -476,7 +476,7 @@ function PMA_getSqlQueryForCopyTable($tables_full, $sql_query, $move, $db) } // apply the triggers to the destination db+table if ($triggers) { - PMA_DBI_select_db($_REQUEST['newname']); + PMA_DBI_selectDb($_REQUEST['newname']); foreach ($triggers as $trigger) { PMA_DBI_query($trigger['create']); $GLOBALS['sql_query'] .= "\n" . $trigger['create'] . ';'; @@ -517,11 +517,11 @@ function PMA_runEventDefinitionsForDb($db) ); if ($event_names) { foreach ($event_names as $event_name) { - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); $tmp_query = PMA_DBI_getDefinition($db, 'EVENT', $event_name); // collect for later display $GLOBALS['sql_query'] .= "\n" . $tmp_query; - PMA_DBI_select_db($_REQUEST['newname']); + PMA_DBI_selectDb($_REQUEST['newname']); PMA_DBI_query($tmp_query); } } @@ -571,7 +571,7 @@ function PMA_handleTheViews($views, $move, $db) */ function PMA_createAllAccumulatedConstraints() { - PMA_DBI_select_db($_REQUEST['newname']); + PMA_DBI_selectDb($_REQUEST['newname']); foreach ($GLOBALS['sql_constraints_query_full_db'] as $one_query) { PMA_DBI_query($one_query); // and prepare to display them diff --git a/libraries/plugins/export/ExportHtmlword.class.php b/libraries/plugins/export/ExportHtmlword.class.php index 0f925f9029..4587b82f1c 100644 --- a/libraries/plugins/export/ExportHtmlword.class.php +++ b/libraries/plugins/export/ExportHtmlword.class.php @@ -353,7 +353,7 @@ class ExportHtmlword extends ExportPlugin /** * Gets fields properties */ - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); // Check if we can use Relations if ($do_relation && ! empty($cfgRelation['relation'])) { diff --git a/libraries/plugins/export/ExportLatex.class.php b/libraries/plugins/export/ExportLatex.class.php index 17150f0a80..5ef5c19b33 100644 --- a/libraries/plugins/export/ExportLatex.class.php +++ b/libraries/plugins/export/ExportLatex.class.php @@ -462,7 +462,7 @@ class ExportLatex extends ExportPlugin /** * Gets fields properties */ - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); // Check if we can use Relations if ($do_relation && ! empty($cfgRelation['relation'])) { diff --git a/libraries/plugins/export/ExportOdt.class.php b/libraries/plugins/export/ExportOdt.class.php index 299326bddf..657eed89e8 100644 --- a/libraries/plugins/export/ExportOdt.class.php +++ b/libraries/plugins/export/ExportOdt.class.php @@ -340,7 +340,7 @@ class ExportOdt extends ExportPlugin /** * Gets fields properties */ - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); /** * Displays the table structure @@ -416,7 +416,7 @@ class ExportOdt extends ExportPlugin /** * Gets fields properties */ - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); // Check if we can use Relations if ($do_relation && ! empty($cfgRelation['relation'])) { diff --git a/libraries/plugins/export/ExportTexytext.class.php b/libraries/plugins/export/ExportTexytext.class.php index 7b1d816cbd..180f9febe7 100644 --- a/libraries/plugins/export/ExportTexytext.class.php +++ b/libraries/plugins/export/ExportTexytext.class.php @@ -259,7 +259,7 @@ class ExportTexytext extends ExportPlugin /** * Gets fields properties */ - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); /** * Displays the table structure @@ -333,7 +333,7 @@ class ExportTexytext extends ExportPlugin /** * Gets fields properties */ - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); // Check if we can use Relations if ($do_relation && ! empty($cfgRelation['relation'])) { diff --git a/libraries/pmd_common.php b/libraries/pmd_common.php index f491e3fa9e..75958affb8 100644 --- a/libraries/pmd_common.php +++ b/libraries/pmd_common.php @@ -29,7 +29,7 @@ function get_tables_info() $tables = PMA_DBI_getTablesFull($GLOBALS['db']); // seems to be needed later - PMA_DBI_select_db($GLOBALS['db']); + PMA_DBI_selectDb($GLOBALS['db']); $i = 0; foreach ($tables as $one_table) { $GLOBALS['PMD']['TABLE_NAME'][$i] @@ -73,7 +73,7 @@ function get_tables_info() */ function get_columns_info() { - PMA_DBI_select_db($GLOBALS['db']); + PMA_DBI_selectDb($GLOBALS['db']); $tab_column = array(); for ($i = 0, $cnt = count($GLOBALS['PMD']["TABLE_NAME"]); $i < $cnt; $i++) { $fields_rs = PMA_DBI_query( @@ -106,7 +106,7 @@ function get_columns_info() */ function get_script_contr() { - PMA_DBI_select_db($GLOBALS['db']); + PMA_DBI_selectDb($GLOBALS['db']); $con["C_NAME"] = array(); $i = 0; $alltab_rs = PMA_DBI_query( diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index aa37c2079c..d5872b9949 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -365,7 +365,7 @@ function PMA__getRelationsParam() if ($GLOBALS['server'] == 0 || empty($GLOBALS['cfg']['Server']['pmadb']) - || ! PMA_DBI_select_db($GLOBALS['cfg']['Server']['pmadb'], $GLOBALS['controllink']) + || ! PMA_DBI_selectDb($GLOBALS['cfg']['Server']['pmadb'], $GLOBALS['controllink']) ) { // No server selected -> no bookmark table // we return the array with the falses in it, diff --git a/libraries/rte/rte_main.inc.php b/libraries/rte/rte_main.inc.php index ae3e63ea4f..6e394f1b61 100644 --- a/libraries/rte/rte_main.inc.php +++ b/libraries/rte/rte_main.inc.php @@ -36,7 +36,7 @@ if ($GLOBALS['is_ajax_request'] != true) { * create the missing $url_query variable */ if (strlen($db)) { - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); if (! isset($url_query)) { $url_query = PMA_generate_common_url($db, $table); } diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index 9a3ecf64a8..bb78daafbb 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -638,7 +638,7 @@ class PMA_User_Schema $export_type = 'pdf'; } - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); include "libraries/schema/" . ucfirst($export_type) . "_Relation_Schema.class.php"; diff --git a/libraries/server_common.inc.php b/libraries/server_common.inc.php index 4e7c47f356..55e584afb8 100644 --- a/libraries/server_common.inc.php +++ b/libraries/server_common.inc.php @@ -36,7 +36,7 @@ $is_superuser = PMA_isSuperuser(); // now, select the mysql db if ($is_superuser && ! PMA_DRIZZLE) { - PMA_DBI_select_db('mysql', $userlink); + PMA_DBI_selectDb('mysql', $userlink); } /** diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php index 3252888e5b..0574471a21 100644 --- a/libraries/structure.lib.php +++ b/libraries/structure.lib.php @@ -2338,7 +2338,7 @@ function PMA_updateColumns($db, $table) // To allow replication, we first select the db to use and then run queries // on this db. - if (! PMA_DBI_select_db($db)) { + if (! PMA_DBI_selectDb($db)) { PMA_Util::mysqlDie( PMA_DBI_getError(), 'USE ' . PMA_Util::backquote($db) . ';', @@ -2419,7 +2419,7 @@ function PMA_updateColumns($db, $table) */ function PMA_moveColumns($db, $table) { - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); /* * load the definitions for all columns diff --git a/libraries/tbl_info.inc.php b/libraries/tbl_info.inc.php index 7347a8497b..10a9ed5e65 100644 --- a/libraries/tbl_info.inc.php +++ b/libraries/tbl_info.inc.php @@ -26,7 +26,7 @@ global $showtable, $tbl_is_view, $tbl_storage_engine, $show_comment, $tbl_collat */ // Seems we need to do this in MySQL 5.0.2, // otherwise error #1046, no database selected -PMA_DBI_select_db($GLOBALS['db']); +PMA_DBI_selectDb($GLOBALS['db']); /** diff --git a/schema_export.php b/schema_export.php index 90f684a2fd..1efc839025 100644 --- a/schema_export.php +++ b/schema_export.php @@ -52,7 +52,7 @@ foreach ($post_params as $one_post_param) { if (! isset($export_type) || ! preg_match('/^[a-zA-Z]+$/', $export_type)) { $export_type = 'pdf'; } -PMA_DBI_select_db($db); +PMA_DBI_selectDb($db); $path = PMA_securePath(ucfirst($export_type)); if (!file_exists('libraries/schema/' . $path . '_Relation_Schema.class.php')) { diff --git a/server_status_monitor.php b/server_status_monitor.php index 72e7a8c8ae..b55eea9292 100644 --- a/server_status_monitor.php +++ b/server_status_monitor.php @@ -349,7 +349,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { $return = array(); if (strlen($_REQUEST['database'])) { - PMA_DBI_select_db($_REQUEST['database']); + PMA_DBI_selectDb($_REQUEST['database']); } if ($profiling = PMA_Util::profilingSupported()) { diff --git a/sql.php b/sql.php index a6d770b5d3..0dbcf9cf63 100644 --- a/sql.php +++ b/sql.php @@ -616,7 +616,7 @@ if (($_SESSION['tmp_user_values']['max_rows'] != 'all') } if (strlen($db)) { - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); } // E x e c u t e t h e q u e r y diff --git a/tbl_addfield.php b/tbl_addfield.php index a456badde9..259581025b 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -170,7 +170,7 @@ if (isset($_REQUEST['do_save_data'])) { // To allow replication, we first select the db to use and then run queries // on this db. - PMA_DBI_select_db($db) + PMA_DBI_selectDb($db) or PMA_Util::mysqlDie( PMA_DBI_getError(), 'USE ' . PMA_Util::backquote($db), '', $err_url ); diff --git a/tbl_change.php b/tbl_change.php index 1085afdfa9..2be72260ce 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -143,7 +143,7 @@ unset($show_create_table); /** * Get the list of the fields of the current table */ -PMA_DBI_select_db($db); +PMA_DBI_selectDb($db); $table_fields = array_values(PMA_DBI_getColumns($db, $table)); $paramTableDbArray = array($table, $db); diff --git a/tbl_create.php b/tbl_create.php index 71061cb5ad..618fd3d9c3 100644 --- a/tbl_create.php +++ b/tbl_create.php @@ -53,7 +53,7 @@ if (isset($_REQUEST['submit_num_fields'])) { /** * Selects the database to work with */ -if (!PMA_DBI_select_db($db)) { +if (!PMA_DBI_selectDb($db)) { PMA_Util::mysqlDie( sprintf(__('\'%s\' database does not exist.'), htmlspecialchars($db)), '', diff --git a/tbl_get_field.php b/tbl_get_field.php index 98085a2b45..84f8681913 100644 --- a/tbl_get_field.php +++ b/tbl_get_field.php @@ -32,7 +32,7 @@ PMA_Util::checkParameters( ); /* Select database */ -if (!PMA_DBI_select_db($db)) { +if (!PMA_DBI_selectDb($db)) { PMA_Util::mysqlDie( sprintf(__('\'%s\' database does not exist.'), htmlspecialchars($db)), '', '' diff --git a/tbl_move_copy.php b/tbl_move_copy.php index b21f295585..3c73ecfe27 100644 --- a/tbl_move_copy.php +++ b/tbl_move_copy.php @@ -22,7 +22,7 @@ $err_url = 'tbl_sql.php?' . PMA_generate_common_url($db, $table); /** * Selects the database to work with */ -PMA_DBI_select_db($db); +PMA_DBI_selectDb($db); $goto = $cfg['DefaultTabTable']; diff --git a/tbl_operations.php b/tbl_operations.php index 22f054db31..c284c7ef98 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -43,7 +43,7 @@ require_once 'libraries/Partition.class.php'; // reselect current db (needed in some cases probably due to // the calling of relation.lib.php) -PMA_DBI_select_db($GLOBALS['db']); +PMA_DBI_selectDb($GLOBALS['db']); /** * Gets tables informations @@ -364,7 +364,7 @@ unset($partition_names); // this choice (InnoDB maintains integrity by itself) if ($cfgRelation['relwork'] && ! $is_innodb) { - PMA_DBI_select_db($GLOBALS['db']); + PMA_DBI_selectDb($GLOBALS['db']); $foreign = PMA_getForeigners($GLOBALS['db'], $GLOBALS['table']); if ($foreign) { diff --git a/tbl_printview.php b/tbl_printview.php index 8e67797522..018737eaf2 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -43,7 +43,7 @@ if (strlen($table)) { /** * Selects the database */ -PMA_DBI_select_db($db); +PMA_DBI_selectDb($db); /** diff --git a/tbl_replace.php b/tbl_replace.php index 55e53d9993..e3b5c6c746 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -25,7 +25,7 @@ require_once 'libraries/insert_edit.lib.php'; // Check parameters PMA_Util::checkParameters(array('db', 'table', 'goto')); -PMA_DBI_select_db($GLOBALS['db']); +PMA_DBI_selectDb($GLOBALS['db']); /** * Initializes some variables diff --git a/transformation_wrapper.php b/transformation_wrapper.php index 436be5a187..2658b9b8f6 100644 --- a/transformation_wrapper.php +++ b/transformation_wrapper.php @@ -46,7 +46,7 @@ foreach ($request_params as $one_request_param) { /** * Get the list of the fields of the current table */ -PMA_DBI_select_db($db); +PMA_DBI_selectDb($db); if (isset($where_clause)) { $result = PMA_DBI_query( 'SELECT * FROM ' . PMA_Util::backquote($table) . ' WHERE ' . $where_clause . ';', diff --git a/user_password.php b/user_password.php index 1e2d174cf6..ca105612de 100644 --- a/user_password.php +++ b/user_password.php @@ -22,7 +22,7 @@ $scripts->addFile('server_privileges.js'); * script */ if (! $cfg['ShowChgPassword']) { - $cfg['ShowChgPassword'] = PMA_DBI_select_db('mysql'); + $cfg['ShowChgPassword'] = PMA_DBI_selectDb('mysql'); } if ($cfg['Server']['auth_type'] == 'config' || ! $cfg['ShowChgPassword']) { PMA_Message::error( From f8bdff415eaff126781a2c9a2502635c73473a12 Mon Sep 17 00:00:00 2001 From: Kasun Chathuranga Date: Sat, 4 May 2013 08:27:28 +0530 Subject: [PATCH 05/36] PMA_DBI_real_query --> PMA_DBI_realQuery --- libraries/database_interface.lib.php | 2 +- libraries/dbi/drizzle.dbi.lib.php | 2 +- libraries/dbi/dummy.lib.php | 2 +- libraries/dbi/mysql.dbi.lib.php | 2 +- libraries/dbi/mysqli.dbi.lib.php | 2 +- test/libraries/database_interface_test.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 9c8c42d8f2..a68d968d27 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -189,7 +189,7 @@ function PMA_DBI_tryQuery($query, $link = null, $options = 0, $time = microtime(true); } - $result = PMA_DBI_real_query($query, $link, $options); + $result = PMA_DBI_realQuery($query, $link, $options); if ($cache_affected_rows) { $GLOBALS['cached_affected_rows'] = PMA_DBI_affected_rows($link, false); diff --git a/libraries/dbi/drizzle.dbi.lib.php b/libraries/dbi/drizzle.dbi.lib.php index 7500f47318..53984bb2a1 100644 --- a/libraries/dbi/drizzle.dbi.lib.php +++ b/libraries/dbi/drizzle.dbi.lib.php @@ -186,7 +186,7 @@ function PMA_DBI_selectDb($dbname, $link = null) * * @return PMA_DrizzleResult */ -function PMA_DBI_real_query($query, $link, $options) +function PMA_DBI_realQuery($query, $link, $options) { $buffer_mode = $options & PMA_DBI_QUERY_UNBUFFERED ? PMA_Drizzle::BUFFER_ROW diff --git a/libraries/dbi/dummy.lib.php b/libraries/dbi/dummy.lib.php index 91942370af..ed88300547 100644 --- a/libraries/dbi/dummy.lib.php +++ b/libraries/dbi/dummy.lib.php @@ -317,7 +317,7 @@ function PMA_DBI_selectDb($dbname, $link = null) * * @return mixed */ -function PMA_DBI_real_query($query, $link = null, $options = 0) +function PMA_DBI_realQuery($query, $link = null, $options = 0) { $query = trim(preg_replace('/ */', ' ', str_replace("\n", ' ', $query))); for ($i = 0; $i < count($GLOBALS['dummy_queries']); $i++) { diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index 99b0a296e6..9ff8b6e0f7 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -209,7 +209,7 @@ function PMA_DBI_selectDb($dbname, $link = null) * * @return mixed */ -function PMA_DBI_real_query($query, $link, $options) +function PMA_DBI_realQuery($query, $link, $options) { if ($options == ($options | PMA_DBI_QUERY_STORE)) { return mysql_query($query, $link); diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 432133a6ed..689864072b 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -254,7 +254,7 @@ function PMA_DBI_selectDb($dbname, $link = null) * * @return mysqli_result|bool */ -function PMA_DBI_real_query($query, $link, $options) +function PMA_DBI_realQuery($query, $link, $options) { if ($options == ($options | PMA_DBI_QUERY_STORE)) { $method = MYSQLI_STORE_RESULT; diff --git a/test/libraries/database_interface_test.php b/test/libraries/database_interface_test.php index a85c3836c7..2ae15f246d 100644 --- a/test/libraries/database_interface_test.php +++ b/test/libraries/database_interface_test.php @@ -39,7 +39,7 @@ class PMA_DBI_Test extends PHPUnit_Framework_TestCase */ function testQuery() { - $this->assertEquals(0, PMA_DBI_real_query('SELECT 1')); + $this->assertEquals(0, PMA_DBI_realQuery('SELECT 1')); } /** From 2a2eac9b53533b3222d6196926f8b567a41afe21 Mon Sep 17 00:00:00 2001 From: Kasun Chathuranga Date: Sat, 4 May 2013 08:28:57 +0530 Subject: [PATCH 06/36] PMA_DBI_fetch_array --> PMA_DBI_fetchArray --- db_tracking.php | 4 ++-- libraries/RecentTable.class.php | 2 +- libraries/Table.class.php | 2 +- libraries/Tracker.class.php | 4 ++-- libraries/database_interface.lib.php | 2 +- libraries/dbi/drizzle.dbi.lib.php | 2 +- libraries/dbi/dummy.lib.php | 2 +- libraries/dbi/mysql.dbi.lib.php | 2 +- libraries/dbi/mysqli.dbi.lib.php | 2 +- libraries/navigation/Nodes/Node_Database.class.php | 10 +++++----- libraries/navigation/Nodes/Node_Table.class.php | 6 +++--- tbl_tracking.php | 6 +++--- test/libraries/database_interface_test.php | 2 +- 13 files changed, 23 insertions(+), 23 deletions(-) diff --git a/db_tracking.php b/db_tracking.php index e95a7e0a5f..21d04dfdbb 100644 --- a/db_tracking.php +++ b/db_tracking.php @@ -104,7 +104,7 @@ if (PMA_DBI_num_rows($all_tables_result) > 0) { } $style = 'odd'; - while ($one_result = PMA_DBI_fetch_array($all_tables_result)) { + while ($one_result = PMA_DBI_fetchArray($all_tables_result)) { list($table_name, $version_number) = $one_result; $table_query = ' SELECT * FROM ' . PMA_Util::backquote($GLOBALS['cfg']['Server']['pmadb']) . '.' . @@ -114,7 +114,7 @@ if (PMA_DBI_num_rows($all_tables_result) > 0) { . '\' AND `version` = \'' . $version_number . '\''; $table_result = PMA_queryAsControlUser($table_query); - $version_data = PMA_DBI_fetch_array($table_result); + $version_data = PMA_DBI_fetchArray($table_result); if ($version_data['tracking_active'] == 1) { $version_status = __('active'); diff --git a/libraries/RecentTable.class.php b/libraries/RecentTable.class.php index f686c17321..6b3864943d 100644 --- a/libraries/RecentTable.class.php +++ b/libraries/RecentTable.class.php @@ -85,7 +85,7 @@ class PMA_RecentTable = " SELECT `tables` FROM " . $this->_pmaTable . " WHERE `username` = '" . $GLOBALS['cfg']['Server']['user'] . "'"; - $row = PMA_DBI_fetch_array(PMA_queryAsControlUser($sql_query)); + $row = PMA_DBI_fetchArray(PMA_queryAsControlUser($sql_query)); if (isset($row[0])) { return json_decode($row[0], true); } else { diff --git a/libraries/Table.class.php b/libraries/Table.class.php index acf00890d6..194658383a 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -1343,7 +1343,7 @@ class PMA_Table . " AND `db_name` = '" . PMA_Util::sqlAddSlashes($this->db_name) . "'" . " AND `table_name` = '" . PMA_Util::sqlAddSlashes($this->name) . "'"; - $row = PMA_DBI_fetch_array(PMA_queryAsControlUser($sql_query)); + $row = PMA_DBI_fetchArray(PMA_queryAsControlUser($sql_query)); if (isset($row[0])) { return json_decode($row[0], true); } else { diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php index aaac9493e9..3bdf9b2887 100644 --- a/libraries/Tracker.class.php +++ b/libraries/Tracker.class.php @@ -213,7 +213,7 @@ class PMA_Tracker " AND table_name = '" . PMA_Util::sqlAddSlashes($tablename) . "' " . " ORDER BY version DESC"; - $row = PMA_DBI_fetch_array(PMA_queryAsControlUser($sql_query)); + $row = PMA_DBI_fetchArray(PMA_queryAsControlUser($sql_query)); if (isset($row['tracking_active']) && $row['tracking_active'] == 1) { return true; @@ -560,7 +560,7 @@ class PMA_Tracker ? ' AND tracking & ' . self::_transformTrackingSet($statement) . ' <> 0' : " AND FIND_IN_SET('" . $statement . "',tracking) > 0" ; } - $row = PMA_DBI_fetch_array(PMA_queryAsControlUser($sql_query)); + $row = PMA_DBI_fetchArray(PMA_queryAsControlUser($sql_query)); return isset($row[0]) ? $row[0] : -1; diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index a68d968d27..4cb066670e 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -1664,7 +1664,7 @@ function PMA_DBI_fetchSingleRow($result, $type = 'ASSOC', $link = null) break; case 'BOTH' : default : - $fetch_function = 'PMA_DBI_fetch_array'; + $fetch_function = 'PMA_DBI_fetchArray'; break; } diff --git a/libraries/dbi/drizzle.dbi.lib.php b/libraries/dbi/drizzle.dbi.lib.php index 53984bb2a1..3b9049fc10 100644 --- a/libraries/dbi/drizzle.dbi.lib.php +++ b/libraries/dbi/drizzle.dbi.lib.php @@ -202,7 +202,7 @@ function PMA_DBI_realQuery($query, $link, $options) * * @return array */ -function PMA_DBI_fetch_array($result) +function PMA_DBI_fetchArray($result) { return $result->fetchRow(PMA_Drizzle::FETCH_BOTH); } diff --git a/libraries/dbi/dummy.lib.php b/libraries/dbi/dummy.lib.php index ed88300547..cd27db5cc6 100644 --- a/libraries/dbi/dummy.lib.php +++ b/libraries/dbi/dummy.lib.php @@ -359,7 +359,7 @@ function PMA_DBI_fetch_any($result) * * @return array */ -function PMA_DBI_fetch_array($result) +function PMA_DBI_fetchArray($result) { $data = PMA_DBI_fetch_any($result); if (is_array($data) && isset($GLOBALS['dummy_queries'][$result]['columns'])) { diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index 9ff8b6e0f7..921f2f7cbc 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -227,7 +227,7 @@ function PMA_DBI_realQuery($query, $link, $options) * * @return array */ -function PMA_DBI_fetch_array($result) +function PMA_DBI_fetchArray($result) { return mysql_fetch_array($result, MYSQL_BOTH); } diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 689864072b..4f068db293 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -287,7 +287,7 @@ function PMA_DBI_realMultiQuery($link, $query) * * @return array */ -function PMA_DBI_fetch_array($result) +function PMA_DBI_fetchArray($result) { return mysqli_fetch_array($result, MYSQLI_BOTH); } diff --git a/libraries/navigation/Nodes/Node_Database.class.php b/libraries/navigation/Nodes/Node_Database.class.php index c65011028d..ac1d33a7f1 100644 --- a/libraries/navigation/Nodes/Node_Database.class.php +++ b/libraries/navigation/Nodes/Node_Database.class.php @@ -254,7 +254,7 @@ class Node_Database extends Node $handle = PMA_DBI_tryQuery($query); if ($handle !== false) { $count = 0; - while ($arr = PMA_DBI_fetch_array($handle)) { + while ($arr = PMA_DBI_fetchArray($handle)) { if ($pos <= 0 && $count < $maxItems) { $retval[] = $arr[0]; $count++; @@ -297,7 +297,7 @@ class Node_Database extends Node $handle = PMA_DBI_tryQuery($query); if ($handle !== false) { $count = 0; - while ($arr = PMA_DBI_fetch_array($handle)) { + while ($arr = PMA_DBI_fetchArray($handle)) { if ($pos <= 0 && $count < $maxItems) { $retval[] = $arr[0]; $count++; @@ -337,7 +337,7 @@ class Node_Database extends Node $handle = PMA_DBI_tryQuery($query); if ($handle !== false) { $count = 0; - while ($arr = PMA_DBI_fetch_array($handle)) { + while ($arr = PMA_DBI_fetchArray($handle)) { if ($pos <= 0 && $count < $maxItems) { $retval[] = $arr['Name']; $count++; @@ -377,7 +377,7 @@ class Node_Database extends Node $handle = PMA_DBI_tryQuery($query); if ($handle !== false) { $count = 0; - while ($arr = PMA_DBI_fetch_array($handle)) { + while ($arr = PMA_DBI_fetchArray($handle)) { if ($pos <= 0 && $count < $maxItems) { $retval[] = $arr['Name']; $count++; @@ -416,7 +416,7 @@ class Node_Database extends Node $handle = PMA_DBI_tryQuery($query); if ($handle !== false) { $count = 0; - while ($arr = PMA_DBI_fetch_array($handle)) { + while ($arr = PMA_DBI_fetchArray($handle)) { if ($pos <= 0 && $count < $maxItems) { $retval[] = $arr['Name']; $count++; diff --git a/libraries/navigation/Nodes/Node_Table.class.php b/libraries/navigation/Nodes/Node_Table.class.php index 5b1c44e2cd..805d34e342 100644 --- a/libraries/navigation/Nodes/Node_Table.class.php +++ b/libraries/navigation/Nodes/Node_Table.class.php @@ -136,7 +136,7 @@ class Node_Table extends Node $handle = PMA_DBI_tryQuery($query); if ($handle !== false) { $count = 0; - while ($arr = PMA_DBI_fetch_array($handle)) { + while ($arr = PMA_DBI_fetchArray($handle)) { if ($pos <= 0 && $count < $maxItems) { $retval[] = $arr['Field']; $count++; @@ -153,7 +153,7 @@ class Node_Table extends Node $handle = PMA_DBI_tryQuery($query); if ($handle !== false) { $count = 0; - while ($arr = PMA_DBI_fetch_array($handle)) { + while ($arr = PMA_DBI_fetchArray($handle)) { if (! in_array($arr['Key_name'], $retval)) { if ($pos <= 0 && $count < $maxItems) { $retval[] = $arr['Key_name']; @@ -182,7 +182,7 @@ class Node_Table extends Node $handle = PMA_DBI_tryQuery($query); if ($handle !== false) { $count = 0; - while ($arr = PMA_DBI_fetch_array($handle)) { + while ($arr = PMA_DBI_fetchArray($handle)) { if ($pos <= 0 && $count < $maxItems) { $retval[] = $arr['Trigger']; $count++; diff --git a/tbl_tracking.php b/tbl_tracking.php index 7e87043e0a..b8ca1773df 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -718,7 +718,7 @@ $sql_result = PMA_queryAsControlUser($sql_query); if (PMA_DBI_num_rows($sql_result) > 0) { echo '
'; echo ' chosenPage) @@ -271,7 +271,7 @@ class PMA_User_Schema . PMA_Util::sqlAddSlashes($this->chosenPage) . '\''; $page_rs = PMA_queryAsControlUser($page_query, false); $array_sh_page = array(); - while ($temp_sh_page = @PMA_DBI_fetch_assoc($page_rs)) { + while ($temp_sh_page = @PMA_DBI_fetchAssoc($page_rs)) { $array_sh_page[] = $temp_sh_page; } /* @@ -427,7 +427,7 @@ class PMA_User_Schema '; - while ($page = PMA_DBI_fetch_assoc($table_info_result)) { + while ($page = PMA_DBI_fetchAssoc($table_info_result)) { echo ''; diff --git a/pmd_relation_new.php b/pmd_relation_new.php index 02f41f5823..af6708d2c4 100644 --- a/pmd_relation_new.php +++ b/pmd_relation_new.php @@ -42,7 +42,7 @@ if (PMA_Util::isForeignKeySupported($type_T1) . '.' . PMA_Util::backquote($T1) . ';' ); $index_array1 = array(); // will be use to emphasis prim. keys in the table view - while ($row = PMA_DBI_fetch_assoc($result)) { + while ($row = PMA_DBI_fetchAssoc($result)) { $index_array1[$row['Column_name']] = 1; } PMA_DBI_free_result($result); @@ -52,7 +52,7 @@ if (PMA_Util::isForeignKeySupported($type_T1) . '.' . PMA_Util::backquote($T2) . ';' ); $index_array2 = array(); // will be used to emphasis prim. keys in the table view - while ($row = PMA_DBI_fetch_assoc($result)) { + while ($row = PMA_DBI_fetchAssoc($result)) { $index_array2[$row['Column_name']] = 1; } PMA_DBI_free_result($result); diff --git a/server_binlog.php b/server_binlog.php index 20f9070a66..23fa8ec170 100644 --- a/server_binlog.php +++ b/server_binlog.php @@ -192,7 +192,7 @@ echo '' . ''; $odd_row = true; -while ($value = PMA_DBI_fetch_assoc($result)) { +while ($value = PMA_DBI_fetchAssoc($result)) { if (! $dontlimitchars && PMA_strlen($value['Info']) > $GLOBALS['cfg']['LimitChars'] ) { diff --git a/server_plugins.php b/server_plugins.php index ffaf6ab701..b4514424a5 100644 --- a/server_plugins.php +++ b/server_plugins.php @@ -43,7 +43,7 @@ $sql = "SELECT p.plugin_name, p.plugin_type, p.is_active, m.module_name, m.modul $res = PMA_DBI_query($sql); $plugins = array(); $modules = array(); -while ($row = PMA_DBI_fetch_assoc($res)) { +while ($row = PMA_DBI_fetchAssoc($res)) { $plugins[$row['plugin_type']][] = $row; $modules[$row['module_name']]['info'] = $row; $modules[$row['module_name']]['plugins'][$row['plugin_type']][] = $row; diff --git a/server_status.php b/server_status.php index 592cf749cc..22a2558e28 100644 --- a/server_status.php +++ b/server_status.php @@ -487,7 +487,7 @@ function getTableProcesslistHtml($ServerStatusData) $retval .= ''; $odd_row = true; - while ($process = PMA_DBI_fetch_assoc($result)) { + while ($process = PMA_DBI_fetchAssoc($result)) { // Array keys need to modify due to the way it has used // to display column values diff --git a/server_status_monitor.php b/server_status_monitor.php index b55eea9292..80ef6808a7 100644 --- a/server_status_monitor.php +++ b/server_status_monitor.php @@ -179,7 +179,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { $return = array('rows' => array(), 'sum' => array()); $type = ''; - while ($row = PMA_DBI_fetch_assoc($result)) { + while ($row = PMA_DBI_fetchAssoc($result)) { $type = strtolower( substr($row['sql_text'], 0, strpos($row['sql_text'], ' ')) ); @@ -244,7 +244,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { $removeVars = isset($_REQUEST['removeVariables']) && $_REQUEST['removeVariables']; - while ($row = PMA_DBI_fetch_assoc($result)) { + while ($row = PMA_DBI_fetchAssoc($result)) { preg_match('/^(\w+)\s/', $row['argument'], $match); $type = strtolower($match[1]); @@ -367,7 +367,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { $return['affectedRows'] = $GLOBALS['cached_affected_rows']; $result = PMA_DBI_tryQuery('EXPLAIN ' . $query); - while ($row = PMA_DBI_fetch_assoc($result)) { + while ($row = PMA_DBI_fetchAssoc($result)) { $return['explain'][] = $row; } @@ -382,7 +382,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { 'SELECT seq,state,duration FROM INFORMATION_SCHEMA.PROFILING' . ' WHERE QUERY_ID=1 ORDER BY seq' ); - while ($row = PMA_DBI_fetch_assoc($result)) { + while ($row = PMA_DBI_fetchAssoc($result)) { $return['profiling'][]= $row; } PMA_DBI_free_result($result); diff --git a/tbl_chart.php b/tbl_chart.php index 834ec29d1b..d584ec646d 100644 --- a/tbl_chart.php +++ b/tbl_chart.php @@ -29,7 +29,7 @@ if (isset($_REQUEST['ajax_request']) . $_REQUEST['pos'] . ', ' . $_REQUEST['session_max_rows']; $data = array(); $result = PMA_DBI_tryQuery($sql_with_limit); - while ($row = PMA_DBI_fetch_assoc($result)) { + while ($row = PMA_DBI_fetchAssoc($result)) { $data[] = $row; } @@ -104,7 +104,7 @@ $data = array(); $result = PMA_DBI_tryQuery($sql_query); $fields_meta = PMA_DBI_get_fields_meta($result); -while ($row = PMA_DBI_fetch_assoc($result)) { +while ($row = PMA_DBI_fetchAssoc($result)) { $data[] = $row; } diff --git a/tbl_create.php b/tbl_create.php index 618fd3d9c3..c04929a397 100644 --- a/tbl_create.php +++ b/tbl_create.php @@ -268,7 +268,7 @@ if (isset($_REQUEST['do_save_data'])) { 'SHOW TABLE STATUS FROM ' . PMA_Util::backquote($db) . ' LIKE \'' . PMA_Util::sqlAddSlashes($table, true) . '\';' ); - $tbl_stats = PMA_DBI_fetch_assoc($tbl_stats_result); + $tbl_stats = PMA_DBI_fetchAssoc($tbl_stats_result); PMA_DBI_free_result($tbl_stats_result); unset($tbl_stats_result); diff --git a/tbl_gis_visualization.php b/tbl_gis_visualization.php index ea2ef1e5bf..cfcbb94d41 100644 --- a/tbl_gis_visualization.php +++ b/tbl_gis_visualization.php @@ -61,7 +61,7 @@ $modified_query = PMA_GIS_modifyQuery($sql_query, $visualizationSettings); $modified_result = PMA_DBI_tryQuery($modified_query); $data = array(); -while ($row = PMA_DBI_fetch_assoc($modified_result)) { +while ($row = PMA_DBI_fetchAssoc($modified_result)) { $data[] = $row; } diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php index f2ab6e6b41..94a711f50c 100644 --- a/tbl_zoom_select.php +++ b/tbl_zoom_select.php @@ -63,7 +63,7 @@ if (isset($_REQUEST['get_data_row']) && $_REQUEST['get_data_row'] == true) { . $_REQUEST['table'] . '` WHERE ' . $_REQUEST['where_clause']; $result = PMA_DBI_query($row_info_query . ";", null, PMA_DBI_QUERY_STORE); $fields_meta = PMA_DBI_get_fields_meta($result); - while ($row = PMA_DBI_fetch_assoc($result)) { + while ($row = PMA_DBI_fetchAssoc($result)) { // for bit fields we need to convert them to printable form $i = 0; foreach ($row as $col => $val) { @@ -140,7 +140,7 @@ if (isset($zoom_submit) //Query execution part $result = PMA_DBI_query($sql_query . ";", null, PMA_DBI_QUERY_STORE); $fields_meta = PMA_DBI_get_fields_meta($result); - while ($row = PMA_DBI_fetch_assoc($result)) { + while ($row = PMA_DBI_fetchAssoc($result)) { //Need a row with indexes as 0,1,2 for the getUniqueCondition // hence using a temporary array $tmpRow = array(); diff --git a/transformation_wrapper.php b/transformation_wrapper.php index 2658b9b8f6..2c55f84c4a 100644 --- a/transformation_wrapper.php +++ b/transformation_wrapper.php @@ -53,14 +53,14 @@ if (isset($where_clause)) { null, PMA_DBI_QUERY_STORE ); - $row = PMA_DBI_fetch_assoc($result); + $row = PMA_DBI_fetchAssoc($result); } else { $result = PMA_DBI_query( 'SELECT * FROM ' . PMA_Util::backquote($table) . ' LIMIT 1;', null, PMA_DBI_QUERY_STORE ); - $row = PMA_DBI_fetch_assoc($result); + $row = PMA_DBI_fetchAssoc($result); } // No row returned From a242ed1ae5f6c449ca2973111a78c471f4f18a27 Mon Sep 17 00:00:00 2001 From: Kasun Chathuranga Date: Sat, 4 May 2013 08:31:22 +0530 Subject: [PATCH 08/36] PMA_DBI_fetch_row --> PMA_DBI_fetchRow --- db_printview.php | 4 ++-- libraries/DBQbe.class.php | 2 +- libraries/DisplayResults.class.php | 10 +++++----- libraries/List_Database.class.php | 4 ++-- libraries/Util.class.php | 2 +- libraries/check_user_privileges.lib.php | 2 +- libraries/database_interface.lib.php | 8 ++++---- libraries/db_info.inc.php | 4 ++-- libraries/dbi/drizzle.dbi.lib.php | 2 +- libraries/dbi/dummy.lib.php | 2 +- libraries/dbi/mysql.dbi.lib.php | 2 +- libraries/dbi/mysqli.dbi.lib.php | 2 +- libraries/insert_edit.lib.php | 4 ++-- libraries/plugins/export/ExportCodegen.class.php | 4 ++-- libraries/plugins/export/ExportCsv.class.php | 2 +- libraries/plugins/export/ExportHtmlword.class.php | 2 +- libraries/plugins/export/ExportJson.class.php | 2 +- libraries/plugins/export/ExportMediawiki.class.php | 2 +- libraries/plugins/export/ExportOds.class.php | 2 +- libraries/plugins/export/ExportOdt.class.php | 2 +- libraries/plugins/export/ExportPhparray.class.php | 2 +- libraries/plugins/export/ExportSql.class.php | 4 ++-- libraries/plugins/export/ExportTexytext.class.php | 2 +- libraries/plugins/export/ExportXml.class.php | 2 +- libraries/plugins/export/ExportYaml.class.php | 2 +- libraries/plugins/export/PMA_ExportPdf.class.php | 4 ++-- libraries/plugins/import/ImportLdi.class.php | 2 +- libraries/pmd_common.php | 2 +- libraries/relation.lib.php | 2 +- libraries/replication.inc.php | 2 +- libraries/schema/Dia_Relation_Schema.class.php | 4 ++-- libraries/schema/Eps_Relation_Schema.class.php | 4 ++-- libraries/schema/Pdf_Relation_Schema.class.php | 6 +++--- libraries/schema/Svg_Relation_Schema.class.php | 4 ++-- libraries/schema/User_Schema.class.php | 4 ++-- libraries/schema/Visio_Relation_Schema.class.php | 4 ++-- libraries/server_privileges.lib.php | 12 ++++++------ sql.php | 2 +- tbl_relation.php | 2 +- 39 files changed, 65 insertions(+), 65 deletions(-) diff --git a/db_printview.php b/db_printview.php index 64b61860dc..53a5697c2c 100644 --- a/db_printview.php +++ b/db_printview.php @@ -38,7 +38,7 @@ if ($cfg['SkipLockedTables'] == true) { $result = PMA_DBI_query('SHOW OPEN TABLES FROM ' . PMA_Util::backquote($db) . ';'); // Blending out tables in use if ($result != false && PMA_DBI_num_rows($result) > 0) { - while ($tmp = PMA_DBI_fetch_row($result)) { + while ($tmp = PMA_DBI_fetchRow($result)) { // if in use memorize tablename if (preg_match('@in_use=[1-9]+@i', $tmp[0])) { $sot_cache[$tmp[0]] = true; @@ -49,7 +49,7 @@ if ($cfg['SkipLockedTables'] == true) { if (isset($sot_cache)) { $result = PMA_DBI_query('SHOW TABLES FROM ' . PMA_Util::backquote($db) . ';', null, PMA_DBI_QUERY_STORE); if ($result != false && PMA_DBI_num_rows($result) > 0) { - while ($tmp = PMA_DBI_fetch_row($result)) { + while ($tmp = PMA_DBI_fetchRow($result)) { if (! isset($sot_cache[$tmp[0]])) { $sts_result = PMA_DBI_query('SHOW TABLE STATUS FROM ' . PMA_Util::backquote($db) . ' LIKE \'' . sqlAddSlashes($tmp[0], true) . '\';'); $sts_tmp = PMA_DBI_fetchAssoc($sts_result); diff --git a/libraries/DBQbe.class.php b/libraries/DBQbe.class.php index b6e62e7fd2..a9d0c9160d 100644 --- a/libraries/DBQbe.class.php +++ b/libraries/DBQbe.class.php @@ -269,7 +269,7 @@ class PMA_DbQbe exit; } // The tables list gets from MySQL - while (list($table) = PMA_DBI_fetch_row($all_tables)) { + while (list($table) = PMA_DBI_fetchRow($all_tables)) { $columns = PMA_DBI_getColumns($this->_db, $table); if (empty($this->_criteriaTables[$table]) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index a043bc5de8..d553bad543 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -2509,7 +2509,7 @@ class PMA_DisplayResults || ($_SESSION['tmp_user_values']['disp_direction'] == self::DISP_DIR_HORIZONTAL_FLIPPED); - while ($row = PMA_DBI_fetch_row($dt_result)) { + while ($row = PMA_DBI_fetchRow($dt_result)) { // "vertical display" mode stuff $table_body_html .= $this->_getVerticalDisplaySupportSegments( @@ -4773,7 +4773,7 @@ class PMA_DisplayResults if ($sorted_column_index !== false) { // fetch first row of the result set - $row = PMA_DBI_fetch_row($dt_result); + $row = PMA_DBI_fetchRow($dt_result); // initializing default arguments $default_function = '_mimeDefaultFunction'; @@ -4803,7 +4803,7 @@ class PMA_DisplayResults // fetch last row of the result set PMA_DBI_data_seek($dt_result, $this->__get('num_rows') - 1); - $row = PMA_DBI_fetch_row($dt_result); + $row = PMA_DBI_fetchRow($dt_result); // check for non printable sorted row data $meta = $fields_meta[$sorted_column_index]; @@ -5074,7 +5074,7 @@ class PMA_DisplayResults // fetch last row of the result set PMA_DBI_data_seek($dt_result, $this->__get('num_rows') - 1); - $row = PMA_DBI_fetch_row($dt_result); + $row = PMA_DBI_fetchRow($dt_result); // $clause_is_unique is needed by getTable() to generate the proper param // in the multi-edit and multi-delete form @@ -5512,7 +5512,7 @@ class PMA_DisplayResults $dispresult = PMA_DBI_tryQuery($dispsql, null, PMA_DBI_QUERY_STORE); if ($dispresult && PMA_DBI_num_rows($dispresult) > 0) { - list($dispval) = PMA_DBI_fetch_row($dispresult, 0); + list($dispval) = PMA_DBI_fetchRow($dispresult, 0); } else { $dispval = __('Link not found'); } diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php index a2d8da210b..f03d4956e6 100644 --- a/libraries/List_Database.class.php +++ b/libraries/List_Database.class.php @@ -455,11 +455,11 @@ class PMA_List_Database extends PMA_List $tmp_alldbs = PMA_DBI_query('SHOW DATABASES;', $GLOBALS['controllink']); // all databases cases - part 2 if (isset($tmp_mydbs['%'])) { - while ($tmp_row = PMA_DBI_fetch_row($tmp_alldbs)) { + while ($tmp_row = PMA_DBI_fetchRow($tmp_alldbs)) { $dblist[] = $tmp_row[0]; } // end while } else { - while ($tmp_row = PMA_DBI_fetch_row($tmp_alldbs)) { + while ($tmp_row = PMA_DBI_fetchRow($tmp_alldbs)) { $tmp_db = $tmp_row[0]; if (isset($tmp_mydbs[$tmp_db]) && $tmp_mydbs[$tmp_db] == 1) { $dblist[] = $tmp_db; diff --git a/libraries/Util.class.php b/libraries/Util.class.php index b50c5f1e07..3f862ca395 100644 --- a/libraries/Util.class.php +++ b/libraries/Util.class.php @@ -3179,7 +3179,7 @@ class PMA_Util } $wktresult = PMA_DBI_tryQuery($wktsql, null, PMA_DBI_QUERY_STORE); - $wktarr = PMA_DBI_fetch_row($wktresult, 0); + $wktarr = PMA_DBI_fetchRow($wktresult, 0); $wktval = $wktarr[0]; if ($includeSRID) { diff --git a/libraries/check_user_privileges.lib.php b/libraries/check_user_privileges.lib.php index f1e8cb2060..623b1f8573 100644 --- a/libraries/check_user_privileges.lib.php +++ b/libraries/check_user_privileges.lib.php @@ -60,7 +60,7 @@ function PMA_analyseShowGrant() $re0 = '(^|(\\\\\\\\)+|[^\\\\])'; // non-escaped wildcards $re1 = '(^|[^\\\\])(\\\)+'; // escaped wildcards - while ($row = PMA_DBI_fetch_row($rs_usr)) { + while ($row = PMA_DBI_fetchRow($rs_usr)) { // extract db from GRANT ... ON *.* or GRANT ... ON db.* $db_name_offset = strpos($row[0], ' ON ') + 4; $show_grants_dbname = substr( diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index c04005682f..b58e31391e 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -1605,7 +1605,7 @@ function PMA_DBI_fetchValue($result, $row_number = 0, $field = 0, $link = null) // if $field is an integer use non associative mysql fetch function if (is_int($field)) { - $fetch_function = 'PMA_DBI_fetch_row'; + $fetch_function = 'PMA_DBI_fetchRow'; } else { $fetch_function = 'PMA_DBI_fetchAssoc'; } @@ -1657,7 +1657,7 @@ function PMA_DBI_fetchSingleRow($result, $type = 'ASSOC', $link = null) switch ($type) { case 'NUM' : - $fetch_function = 'PMA_DBI_fetch_row'; + $fetch_function = 'PMA_DBI_fetchRow'; break; case 'ASSOC' : $fetch_function = 'PMA_DBI_fetchAssoc'; @@ -1744,12 +1744,12 @@ function PMA_DBI_fetchResult($result, $key = null, $value = null, // no nested array if only one field is in result if (null === $key && 1 === PMA_DBI_num_fields($result)) { $value = 0; - $fetch_function = 'PMA_DBI_fetch_row'; + $fetch_function = 'PMA_DBI_fetchRow'; } // if $key is an integer use non associative mysql fetch function if (is_int($key)) { - $fetch_function = 'PMA_DBI_fetch_row'; + $fetch_function = 'PMA_DBI_fetchRow'; } if (null === $key && null === $value) { diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php index 2565788aab..47a462629e 100644 --- a/libraries/db_info.inc.php +++ b/libraries/db_info.inc.php @@ -72,7 +72,7 @@ if (true === $cfg['SkipLockedTables']) { // Blending out tables in use if ($db_info_result && PMA_DBI_num_rows($db_info_result) > 0) { - while ($tmp = PMA_DBI_fetch_row($db_info_result)) { + while ($tmp = PMA_DBI_fetchRow($db_info_result)) { // if in use memorize tablename if (preg_match('@in_use=[1-9]+@i', $tmp[1])) { $sot_cache[$tmp[0]] = true; @@ -86,7 +86,7 @@ if (true === $cfg['SkipLockedTables']) { null, PMA_DBI_QUERY_STORE ); if ($db_info_result && PMA_DBI_num_rows($db_info_result) > 0) { - while ($tmp = PMA_DBI_fetch_row($db_info_result)) { + while ($tmp = PMA_DBI_fetchRow($db_info_result)) { if (! isset($sot_cache[$tmp[0]])) { $sts_result = PMA_DBI_query( 'SHOW TABLE STATUS FROM ' . PMA_Util::backquote($db) diff --git a/libraries/dbi/drizzle.dbi.lib.php b/libraries/dbi/drizzle.dbi.lib.php index 0425f09ad0..bdcb333128 100644 --- a/libraries/dbi/drizzle.dbi.lib.php +++ b/libraries/dbi/drizzle.dbi.lib.php @@ -226,7 +226,7 @@ function PMA_DBI_fetchAssoc($result) * * @return array */ -function PMA_DBI_fetch_row($result) +function PMA_DBI_fetchRow($result) { return $result->fetchRow(PMA_Drizzle::FETCH_NUM); } diff --git a/libraries/dbi/dummy.lib.php b/libraries/dbi/dummy.lib.php index 3da891ab40..d9ae1e6da3 100644 --- a/libraries/dbi/dummy.lib.php +++ b/libraries/dbi/dummy.lib.php @@ -398,7 +398,7 @@ function PMA_DBI_fetchAssoc($result) * * @return array */ -function PMA_DBI_fetch_row($result) +function PMA_DBI_fetchRow($result) { $data = PMA_DBI_fetch_any($result); return $data; diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index 261cda4751..28941a0c79 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -251,7 +251,7 @@ function PMA_DBI_fetchAssoc($result) * * @return array */ -function PMA_DBI_fetch_row($result) +function PMA_DBI_fetchRow($result) { return mysql_fetch_array($result, MYSQL_NUM); } diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index e0fdb42940..91bd8f1259 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -311,7 +311,7 @@ function PMA_DBI_fetchAssoc($result) * * @return array */ -function PMA_DBI_fetch_row($result) +function PMA_DBI_fetchRow($result) { return mysqli_fetch_array($result, MYSQLI_NUM); } diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index 5e37b24913..b5dcd8fdd9 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -1787,7 +1787,7 @@ function PMA_setSessionForEditNext($one_where_clause) . str_replace('` =', '` >', $one_where_clause) . ' LIMIT 1;'; $res = PMA_DBI_query($local_query); - $row = PMA_DBI_fetch_row($res); + $row = PMA_DBI_fetchRow($res); $meta = PMA_DBI_get_fields_meta($res); // must find a unique condition based on unique key, // not a combination of all fields @@ -1995,7 +1995,7 @@ function PMA_getDisplayValueForForeignTableColumn($where_comparison, . $where_comparison; $dispresult = PMA_DBI_tryQuery($dispsql, null, PMA_DBI_QUERY_STORE); if ($dispresult && PMA_DBI_num_rows($dispresult) > 0) { - list($dispval) = PMA_DBI_fetch_row($dispresult, 0); + list($dispval) = PMA_DBI_fetchRow($dispresult, 0); } @PMA_DBI_free_result($dispresult); return $dispval; diff --git a/libraries/plugins/export/ExportCodegen.class.php b/libraries/plugins/export/ExportCodegen.class.php index d0a2216a4c..9b342be84d 100644 --- a/libraries/plugins/export/ExportCodegen.class.php +++ b/libraries/plugins/export/ExportCodegen.class.php @@ -252,7 +252,7 @@ class ExportCodegen extends ExportPlugin ); if ($result) { $tableProperties = array(); - while ($row = PMA_DBI_fetch_row($result)) { + while ($row = PMA_DBI_fetchRow($result)) { $tableProperties[] = new TableProperty($row); } PMA_DBI_free_result($result); @@ -343,7 +343,7 @@ class ExportCodegen extends ExportPlugin ) ); if ($result) { - while ($row = PMA_DBI_fetch_row($result)) { + while ($row = PMA_DBI_fetchRow($result)) { $tableProperty = new TableProperty($row); if ($tableProperty->isPK()) { $lines[] = $tableProperty->formatXml( diff --git a/libraries/plugins/export/ExportCsv.class.php b/libraries/plugins/export/ExportCsv.class.php index add779405a..a8b52469f9 100644 --- a/libraries/plugins/export/ExportCsv.class.php +++ b/libraries/plugins/export/ExportCsv.class.php @@ -273,7 +273,7 @@ class ExportCsv extends ExportPlugin } // end if // Format the data - while ($row = PMA_DBI_fetch_row($result)) { + while ($row = PMA_DBI_fetchRow($result)) { $schema_insert = ''; for ($j = 0; $j < $fields_cnt; $j++) { if (! isset($row[$j]) || is_null($row[$j])) { diff --git a/libraries/plugins/export/ExportHtmlword.class.php b/libraries/plugins/export/ExportHtmlword.class.php index 4587b82f1c..fd7421a42a 100644 --- a/libraries/plugins/export/ExportHtmlword.class.php +++ b/libraries/plugins/export/ExportHtmlword.class.php @@ -232,7 +232,7 @@ class ExportHtmlword extends ExportPlugin } // end if // Format the data - while ($row = PMA_DBI_fetch_row($result)) { + while ($row = PMA_DBI_fetchRow($result)) { $schema_insert = ''; for ($j = 0; $j < $fields_cnt; $j++) { if (! isset($row[$j]) || is_null($row[$j])) { diff --git a/libraries/plugins/export/ExportJson.class.php b/libraries/plugins/export/ExportJson.class.php index 299e248c02..b74ccb52b7 100644 --- a/libraries/plugins/export/ExportJson.class.php +++ b/libraries/plugins/export/ExportJson.class.php @@ -171,7 +171,7 @@ class ExportJson extends ExportPlugin $buffer = ''; $record_cnt = 0; - while ($record = PMA_DBI_fetch_row($result)) { + while ($record = PMA_DBI_fetchRow($result)) { $record_cnt++; diff --git a/libraries/plugins/export/ExportMediawiki.class.php b/libraries/plugins/export/ExportMediawiki.class.php index d39a95db25..8e15f9f091 100644 --- a/libraries/plugins/export/ExportMediawiki.class.php +++ b/libraries/plugins/export/ExportMediawiki.class.php @@ -318,7 +318,7 @@ class ExportMediawiki extends ExportPlugin $result = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED); $fields_cnt = PMA_DBI_num_fields($result); - while ($row = PMA_DBI_fetch_row($result)) { + while ($row = PMA_DBI_fetchRow($result)) { $output .= "|-" . $this->_exportCRLF(); // Use '|' for separating table columns diff --git a/libraries/plugins/export/ExportOds.class.php b/libraries/plugins/export/ExportOds.class.php index de7b67b6ee..4c8a3f4737 100644 --- a/libraries/plugins/export/ExportOds.class.php +++ b/libraries/plugins/export/ExportOds.class.php @@ -254,7 +254,7 @@ class ExportOds extends ExportPlugin } // end if // Format the data - while ($row = PMA_DBI_fetch_row($result)) { + while ($row = PMA_DBI_fetchRow($result)) { $GLOBALS['ods_buffer'] .= ''; for ($j = 0; $j < $fields_cnt; $j++) { if (! isset($row[$j]) || is_null($row[$j])) { diff --git a/libraries/plugins/export/ExportOdt.class.php b/libraries/plugins/export/ExportOdt.class.php index 657eed89e8..aefec3a0c4 100644 --- a/libraries/plugins/export/ExportOdt.class.php +++ b/libraries/plugins/export/ExportOdt.class.php @@ -279,7 +279,7 @@ class ExportOdt extends ExportPlugin } // end if // Format the data - while ($row = PMA_DBI_fetch_row($result)) { + while ($row = PMA_DBI_fetchRow($result)) { $GLOBALS['odt_buffer'] .= ''; for ($j = 0; $j < $fields_cnt; $j++) { if (! isset($row[$j]) || is_null($row[$j])) { diff --git a/libraries/plugins/export/ExportPhparray.class.php b/libraries/plugins/export/ExportPhparray.class.php index cbe5e2c039..dde5e1713a 100644 --- a/libraries/plugins/export/ExportPhparray.class.php +++ b/libraries/plugins/export/ExportPhparray.class.php @@ -191,7 +191,7 @@ class ExportPhparray extends ExportPlugin $buffer = ''; $record_cnt = 0; - while ($record = PMA_DBI_fetch_row($result)) { + while ($record = PMA_DBI_fetchRow($result)) { $record_cnt++; // Output table name as comment if it's the first record of the table diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php index bd5be1c0df..11e1972657 100644 --- a/libraries/plugins/export/ExportSql.class.php +++ b/libraries/plugins/export/ExportSql.class.php @@ -1020,7 +1020,7 @@ class ExportSql extends ExportPlugin return $this->_exportComment(__('in use') . '(' . $tmp_error . ')'); } - if ($result != false && ($row = PMA_DBI_fetch_row($result))) { + if ($result != false && ($row = PMA_DBI_fetchRow($result))) { $create_query = $row[1]; unset($row); @@ -1697,7 +1697,7 @@ class ExportSql extends ExportPlugin $separator = ';'; } - while ($row = PMA_DBI_fetch_row($result)) { + while ($row = PMA_DBI_fetchRow($result)) { if ($current_row == 0) { $head = $this->_possibleCRLF() . $this->_exportComment() diff --git a/libraries/plugins/export/ExportTexytext.class.php b/libraries/plugins/export/ExportTexytext.class.php index 180f9febe7..c3dd401e04 100644 --- a/libraries/plugins/export/ExportTexytext.class.php +++ b/libraries/plugins/export/ExportTexytext.class.php @@ -207,7 +207,7 @@ class ExportTexytext extends ExportPlugin } // end if // Format the data - while ($row = PMA_DBI_fetch_row($result)) { + while ($row = PMA_DBI_fetchRow($result)) { $text_output = ''; for ($j = 0; $j < $fields_cnt; $j++) { if (! isset($row[$j]) || is_null($row[$j])) { diff --git a/libraries/plugins/export/ExportXml.class.php b/libraries/plugins/export/ExportXml.class.php index bb0db9a93b..a11c53c8fe 100644 --- a/libraries/plugins/export/ExportXml.class.php +++ b/libraries/plugins/export/ExportXml.class.php @@ -459,7 +459,7 @@ class ExportXml extends ExportPlugin return false; } - while ($record = PMA_DBI_fetch_row($result)) { + while ($record = PMA_DBI_fetchRow($result)) { $buffer = ' ' . $crlf; for ($i = 0; $i < $columns_cnt; $i++) { diff --git a/libraries/plugins/export/ExportYaml.class.php b/libraries/plugins/export/ExportYaml.class.php index 044daeee47..3f32eb84d3 100644 --- a/libraries/plugins/export/ExportYaml.class.php +++ b/libraries/plugins/export/ExportYaml.class.php @@ -166,7 +166,7 @@ class ExportYaml extends ExportPlugin $buffer = ''; $record_cnt = 0; - while ($record = PMA_DBI_fetch_row($result)) { + while ($record = PMA_DBI_fetchRow($result)) { $record_cnt++; // Output table name as comment if this is the first record of the table diff --git a/libraries/plugins/export/PMA_ExportPdf.class.php b/libraries/plugins/export/PMA_ExportPdf.class.php index 440d804c35..940930f17f 100644 --- a/libraries/plugins/export/PMA_ExportPdf.class.php +++ b/libraries/plugins/export/PMA_ExportPdf.class.php @@ -178,7 +178,7 @@ class PMA_ExportPdf extends PMA_PDF $tmpheight = array(); $maxpage = $this->page; - while ($data = PMA_DBI_fetch_row($this->results)) { + while ($data = PMA_DBI_fetchRow($this->results)) { $this->page = $currpage; // write the horizontal borders $this->Line($l, $h, $fullwidth+$l, $h); @@ -345,7 +345,7 @@ class PMA_ExportPdf extends PMA_PDF /** * @todo force here a LIMIT to avoid reading all rows */ - while ($row = PMA_DBI_fetch_row($this->results)) { + while ($row = PMA_DBI_fetchRow($this->results)) { foreach ($colFits as $key => $val) { $stringWidth = $this->getstringwidth($row[$key]) + 6 ; if ($adjustingMode && ($stringWidth > $this->sColWidth)) { diff --git a/libraries/plugins/import/ImportLdi.class.php b/libraries/plugins/import/ImportLdi.class.php index c39198d311..c90991731b 100644 --- a/libraries/plugins/import/ImportLdi.class.php +++ b/libraries/plugins/import/ImportLdi.class.php @@ -48,7 +48,7 @@ class ImportLdi extends AbstractImportCsv $result = PMA_DBI_tryQuery('SHOW VARIABLES LIKE \'local\\_infile\';'); if ($result != false && PMA_DBI_num_rows($result) > 0) { - $tmp = PMA_DBI_fetch_row($result); + $tmp = PMA_DBI_fetchRow($result); if ($tmp[1] == 'ON') { $GLOBALS['cfg']['Import']['ldi_local_option'] = true; } diff --git a/libraries/pmd_common.php b/libraries/pmd_common.php index b384552bd5..406f1f2bc0 100644 --- a/libraries/pmd_common.php +++ b/libraries/pmd_common.php @@ -114,7 +114,7 @@ function get_script_contr() null, PMA_DBI_QUERY_STORE ); - while ($val = @PMA_DBI_fetch_row($alltab_rs)) { + while ($val = @PMA_DBI_fetchRow($alltab_rs)) { $row = PMA_getForeigners($GLOBALS['db'], $val[0], '', 'internal'); //echo "
internal ".$GLOBALS['db']." - ".$val[0]." - "; //print_r($row); diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 9922fc9344..87cc33cd84 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -395,7 +395,7 @@ function PMA__getRelationsParam() return $cfgRelation; } - while ($curr_table = @PMA_DBI_fetch_row($tab_rs)) { + while ($curr_table = @PMA_DBI_fetchRow($tab_rs)) { if ($curr_table[0] == $GLOBALS['cfg']['Server']['bookmarktable']) { $cfgRelation['bookmark'] = $curr_table[0]; } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['relation']) { diff --git a/libraries/replication.inc.php b/libraries/replication.inc.php index 672cb341ea..e0c77f951d 100644 --- a/libraries/replication.inc.php +++ b/libraries/replication.inc.php @@ -285,7 +285,7 @@ function PMA_replication_master_replicated_dbs($link = null) } $tmp_alldbs = PMA_DBI_query('SHOW DATABASES;', $link); - while ($tmp_row = PMA_DBI_fetch_row($tmp_alldbs)) { + while ($tmp_row = PMA_DBI_fetchRow($tmp_alldbs)) { if (PMA_is_system_schema($tmp_row[0])) { continue; } diff --git a/libraries/schema/Dia_Relation_Schema.class.php b/libraries/schema/Dia_Relation_Schema.class.php index c3122495c3..90160dc762 100644 --- a/libraries/schema/Dia_Relation_Schema.class.php +++ b/libraries/schema/Dia_Relation_Schema.class.php @@ -251,7 +251,7 @@ class Table_Stats } $this->fields = array_keys($all_columns); } else { - while ($row = PMA_DBI_fetch_row($result)) { + while ($row = PMA_DBI_fetchRow($result)) { $this->fields[] = $row[0]; } } @@ -274,7 +274,7 @@ class Table_Stats ) ); } - list($this->x, $this->y) = PMA_DBI_fetch_row($result); + list($this->x, $this->y) = PMA_DBI_fetchRow($result); $this->x = (double) $this->x; $this->y = (double) $this->y; /* diff --git a/libraries/schema/Eps_Relation_Schema.class.php b/libraries/schema/Eps_Relation_Schema.class.php index 4e864542e2..d2cf3ad3e1 100644 --- a/libraries/schema/Eps_Relation_Schema.class.php +++ b/libraries/schema/Eps_Relation_Schema.class.php @@ -441,7 +441,7 @@ class Table_Stats } $this->fields = array_keys($all_columns); } else { - while ($row = PMA_DBI_fetch_row($result)) { + while ($row = PMA_DBI_fetchRow($result)) { $this->fields[] = $row[0]; } } @@ -476,7 +476,7 @@ class Table_Stats ) ); } - list($this->x, $this->y) = PMA_DBI_fetch_row($result); + list($this->x, $this->y) = PMA_DBI_fetchRow($result); $this->x = (double) $this->x; $this->y = (double) $this->y; // displayfield diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php index 5e4ee400a2..d271f283d5 100644 --- a/libraries/schema/Pdf_Relation_Schema.class.php +++ b/libraries/schema/Pdf_Relation_Schema.class.php @@ -422,7 +422,7 @@ class Table_Stats } $this->fields = array_keys($all_columns); } else { - while ($row = PMA_DBI_fetch_row($result)) { + while ($row = PMA_DBI_fetchRow($result)) { $this->fields[] = $row[0]; } } @@ -452,7 +452,7 @@ class Table_Stats ) ); } - list($this->x, $this->y) = PMA_DBI_fetch_row($result); + list($this->x, $this->y) = PMA_DBI_fetchRow($result); $this->x = (double) $this->x; $this->y = (double) $this->y; /* @@ -1151,7 +1151,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema . ' WHERE page_nr = ' . $pageNumber; $_name_rs = PMA_queryAsControlUser($_name_sql); if ($_name_rs) { - $_name_row = PMA_DBI_fetch_row($_name_rs); + $_name_row = PMA_DBI_fetchRow($_name_rs); $filename = $_name_row[0] . '.pdf'; } if (empty($filename)) { diff --git a/libraries/schema/Svg_Relation_Schema.class.php b/libraries/schema/Svg_Relation_Schema.class.php index 0cd4b27cdf..ecd2562deb 100644 --- a/libraries/schema/Svg_Relation_Schema.class.php +++ b/libraries/schema/Svg_Relation_Schema.class.php @@ -409,7 +409,7 @@ class Table_Stats } $this->fields = array_keys($all_columns); } else { - while ($row = PMA_DBI_fetch_row($result)) { + while ($row = PMA_DBI_fetchRow($result)) { $this->fields[] = $row[0]; } } @@ -445,7 +445,7 @@ class Table_Stats ) ); } - list($this->x, $this->y) = PMA_DBI_fetch_row($result); + list($this->x, $this->y) = PMA_DBI_fetchRow($result); $this->x = (double) $this->x; $this->y = (double) $this->y; // displayfield diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index 16a3fa8a19..18cef0610e 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -250,7 +250,7 @@ class PMA_User_Schema null, PMA_DBI_QUERY_STORE ); - while ($val = @PMA_DBI_fetch_row($alltab_rs)) { + while ($val = @PMA_DBI_fetchRow($alltab_rs)) { $selectboxall[] = $val[0]; } @@ -752,7 +752,7 @@ class PMA_User_Schema * of the list, so they are near the center of * the schema */ - while (list(, $master_table) = PMA_DBI_fetch_row($master_tables_rs)) { + while (list(, $master_table) = PMA_DBI_fetchRow($master_tables_rs)) { $all_tables[] = $master_table; } diff --git a/libraries/schema/Visio_Relation_Schema.class.php b/libraries/schema/Visio_Relation_Schema.class.php index 07a65ce602..0e19bfd9b3 100644 --- a/libraries/schema/Visio_Relation_Schema.class.php +++ b/libraries/schema/Visio_Relation_Schema.class.php @@ -249,7 +249,7 @@ class Table_Stats } $this->fields = array_keys($all_columns); } else { - while ($row = PMA_DBI_fetch_row($result)) { + while ($row = PMA_DBI_fetchRow($result)) { $this->fields[] = $row[0]; } } @@ -285,7 +285,7 @@ class Table_Stats ) ); } - list($this->x, $this->y) = PMA_DBI_fetch_row($result); + list($this->x, $this->y) = PMA_DBI_fetchRow($result); $this->x = (double) $this->x; $this->y = (double) $this->y; // displayfield diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index 1c5d47705d..c986149dcd 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -398,7 +398,7 @@ function PMA_getHtmlToDisplayPrivilegesTable($db = '*', $sql_query = 'SHOW COLUMNS FROM `mysql`.`db`;'; } $res = PMA_DBI_query($sql_query); - while ($row1 = PMA_DBI_fetch_row($res)) { + while ($row1 = PMA_DBI_fetchRow($res)) { if (substr($row1[0], 0, 4) == 'max_') { $row[$row1[0]] = 0; } else { @@ -447,7 +447,7 @@ function PMA_getHtmlToDisplayPrivilegesTable($db = '*', ); $columns = array(); if ($res) { - while ($row1 = PMA_DBI_fetch_row($res)) { + while ($row1 = PMA_DBI_fetchRow($res)) { $columns[$row1[0]] = array( 'Select' => false, 'Insert' => false, @@ -584,7 +584,7 @@ function PMA_getHtmlForTableSpecificPrivileges($username, $hostname, $db, .' = \'' . PMA_Util::sqlAddSlashes($table) . '\';' ); - while ($row1 = PMA_DBI_fetch_row($res)) { + while ($row1 = PMA_DBI_fetchRow($res)) { $row1[1] = explode(',', $row1[1]); foreach ($row1[1] as $current) { $columns[$row1[0]][$current] = true; @@ -1915,7 +1915,7 @@ function PMA_getExtraDataForAjaxBehavior($password, $link_export, $sql_query, $sql_query = "SELECT * FROM `mysql`.`user` WHERE `User` = '" . $_REQUEST['username'] . "';"; $res = PMA_DBI_query($sql_query); - $row = PMA_DBI_fetch_row($res); + $row = PMA_DBI_fetchRow($res); if (empty($row)) { $extra_data['user_exists'] = false; } else { @@ -2335,7 +2335,7 @@ function PMA_displayTablesInEditPrivs($dbname, $found_rows) if ($result) { $pred_tbl_array = array(); - while ($row = PMA_DBI_fetch_row($result)) { + while ($row = PMA_DBI_fetchRow($result)) { if (! isset($found_rows) || ! in_array($row[0], $found_rows)) { $pred_tbl_array[] = $row[0]; } @@ -2589,7 +2589,7 @@ function PMA_getHtmlForDisplayTheInitials($array_initials, $conditional_class) null, PMA_DBI_QUERY_STORE ); - while (list($tmp_initial) = PMA_DBI_fetch_row($initials)) { + while (list($tmp_initial) = PMA_DBI_fetchRow($initials)) { $array_initials[$tmp_initial] = true; } diff --git a/sql.php b/sql.php index 0dbcf9cf63..80d9739280 100644 --- a/sql.php +++ b/sql.php @@ -1012,7 +1012,7 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) { //If we are retrieving the full value of a truncated field or the original // value of a transformed field, show it here and exit if ($GLOBALS['grid_edit'] == true) { - $row = PMA_DBI_fetch_row($result); + $row = PMA_DBI_fetchRow($result); $response = PMA_Response::getInstance(); $response->addJSON('value', $row[0]); exit; diff --git a/tbl_relation.php b/tbl_relation.php index 48e4132d43..78815abcf9 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -336,7 +336,7 @@ if ($cfgRelation['relwork'] $selectboxall[] = ''; $selectboxall_foreign[] = ''; - while ($curr_table = PMA_DBI_fetch_row($tab_rs)) { + while ($curr_table = PMA_DBI_fetchRow($tab_rs)) { $current_table = new PMA_Table($curr_table[0], $db); // explicitely ask for non-quoted list of indexed columns From d454b4156458eb13ed6c19095dd1628f2af028fb Mon Sep 17 00:00:00 2001 From: Kasun Chathuranga Date: Sat, 4 May 2013 08:31:47 +0530 Subject: [PATCH 09/36] PMA_DBI_data_seek --> PMA_DBI_dataSeek --- libraries/DisplayResults.class.php | 8 ++++---- libraries/dbi/drizzle.dbi.lib.php | 2 +- libraries/dbi/dummy.lib.php | 2 +- libraries/dbi/mysql.dbi.lib.php | 2 +- libraries/dbi/mysqli.dbi.lib.php | 2 +- tbl_tracking.php | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index d553bad543..dced3a2987 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -4802,7 +4802,7 @@ class PMA_DisplayResults ); // fetch last row of the result set - PMA_DBI_data_seek($dt_result, $this->__get('num_rows') - 1); + PMA_DBI_dataSeek($dt_result, $this->__get('num_rows') - 1); $row = PMA_DBI_fetchRow($dt_result); // check for non printable sorted row data @@ -4826,7 +4826,7 @@ class PMA_DisplayResults ); // reset to first row for the loop in _getTableBody() - PMA_DBI_data_seek($dt_result, 0); + PMA_DBI_dataSeek($dt_result, 0); // we could also use here $sort_expression_nodirection return ' [' . htmlspecialchars($sort_column) @@ -5073,7 +5073,7 @@ class PMA_DisplayResults } // fetch last row of the result set - PMA_DBI_data_seek($dt_result, $this->__get('num_rows') - 1); + PMA_DBI_dataSeek($dt_result, $this->__get('num_rows') - 1); $row = PMA_DBI_fetchRow($dt_result); // $clause_is_unique is needed by getTable() to generate the proper param @@ -5087,7 +5087,7 @@ class PMA_DisplayResults ); // reset to first row for the loop in _getTableBody() - PMA_DBI_data_seek($dt_result, 0); + PMA_DBI_dataSeek($dt_result, 0); $links_html .= '' . "\n"; diff --git a/libraries/dbi/drizzle.dbi.lib.php b/libraries/dbi/drizzle.dbi.lib.php index bdcb333128..0cd05169ed 100644 --- a/libraries/dbi/drizzle.dbi.lib.php +++ b/libraries/dbi/drizzle.dbi.lib.php @@ -239,7 +239,7 @@ function PMA_DBI_fetchRow($result) * * @return boolean true on success, false on failure */ -function PMA_DBI_data_seek($result, $offset) +function PMA_DBI_dataSeek($result, $offset) { return $result->seek($offset); } diff --git a/libraries/dbi/dummy.lib.php b/libraries/dbi/dummy.lib.php index d9ae1e6da3..327a1c854e 100644 --- a/libraries/dbi/dummy.lib.php +++ b/libraries/dbi/dummy.lib.php @@ -412,7 +412,7 @@ function PMA_DBI_fetchRow($result) * * @return bool true on success, false on failure */ -function PMA_DBI_data_seek($result, $offset) +function PMA_DBI_dataSeek($result, $offset) { if ($offset > count($GLOBALS['dummy_queries'][$i]['result'])) { return false; diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index 28941a0c79..285256b2d5 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -264,7 +264,7 @@ function PMA_DBI_fetchRow($result) * * @return bool true on success, false on failure */ -function PMA_DBI_data_seek($result, $offset) +function PMA_DBI_dataSeek($result, $offset) { return mysql_data_seek($result, $offset); } diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 91bd8f1259..cddc7b1306 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -324,7 +324,7 @@ function PMA_DBI_fetchRow($result) * * @return bool true on success, false on failure */ -function PMA_DBI_data_seek($result, $offset) +function PMA_DBI_dataSeek($result, $offset) { return mysqli_data_seek($result, $offset); } diff --git a/tbl_tracking.php b/tbl_tracking.php index b8ca1773df..940fc5e722 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -771,7 +771,7 @@ if ($last_version > 0) { echo ''; $style = 'odd'; - PMA_DBI_data_seek($sql_result, 0); + PMA_DBI_dataSeek($sql_result, 0); while ($version = PMA_DBI_fetchArray($sql_result)) { if ($version['tracking_active'] == 1) { $version_status = __('active'); From 1c884f0ccadcbc302490caa9cd808de6685788e3 Mon Sep 17 00:00:00 2001 From: Kasun Chathuranga Date: Sat, 4 May 2013 08:33:49 +0530 Subject: [PATCH 10/36] PMA_DBI_free_result --> PMA_DBI_freeResult --- db_printview.php | 6 +++--- libraries/DBQbe.class.php | 2 +- libraries/DbSearch.class.php | 2 +- libraries/DisplayResults.class.php | 2 +- libraries/List_Database.class.php | 4 ++-- libraries/StorageEngine.class.php | 2 +- libraries/Table.class.php | 6 +++--- libraries/Util.class.php | 2 +- libraries/check_user_privileges.lib.php | 2 +- libraries/core.lib.php | 2 +- libraries/database_interface.lib.php | 8 ++++---- libraries/db_info.inc.php | 8 ++++---- libraries/db_table_exists.lib.php | 4 ++-- libraries/dbi/drizzle.dbi.lib.php | 2 +- libraries/dbi/dummy.lib.php | 2 +- libraries/dbi/mysql.dbi.lib.php | 2 +- libraries/dbi/mysqli.dbi.lib.php | 2 +- libraries/insert_edit.lib.php | 4 ++-- libraries/mult_submits.inc.php | 4 ++-- libraries/mysql_charsets.lib.php | 4 ++-- .../plugins/export/ExportCodegen.class.php | 4 ++-- libraries/plugins/export/ExportCsv.class.php | 2 +- .../plugins/export/ExportHtmlword.class.php | 2 +- libraries/plugins/export/ExportJson.class.php | 2 +- .../plugins/export/ExportLatex.class.php | 2 +- libraries/plugins/export/ExportOds.class.php | 2 +- libraries/plugins/export/ExportOdt.class.php | 2 +- .../plugins/export/ExportPhparray.class.php | 2 +- libraries/plugins/export/ExportSql.class.php | 6 +++--- .../plugins/export/ExportTexytext.class.php | 2 +- libraries/plugins/export/ExportXml.class.php | 2 +- libraries/plugins/export/ExportYaml.class.php | 2 +- .../plugins/export/PMA_ExportPdf.class.php | 4 ++-- libraries/plugins/import/ImportLdi.class.php | 2 +- libraries/relation.lib.php | 10 +++++----- libraries/rte/rte_routines.lib.php | 2 +- .../schema/Pdf_Relation_Schema.class.php | 2 +- libraries/schema/User_Schema.class.php | 2 +- libraries/server_privileges.lib.php | 20 +++++++++---------- libraries/transformations.lib.php | 2 +- pmd_relation_new.php | 4 ++-- server_plugins.php | 2 +- server_status_monitor.php | 8 ++++---- sql.php | 4 ++-- tbl_create.php | 2 +- 45 files changed, 82 insertions(+), 82 deletions(-) diff --git a/db_printview.php b/db_printview.php index 53a5697c2c..220a263347 100644 --- a/db_printview.php +++ b/db_printview.php @@ -44,7 +44,7 @@ if ($cfg['SkipLockedTables'] == true) { $sot_cache[$tmp[0]] = true; } } - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); if (isset($sot_cache)) { $result = PMA_DBI_query('SHOW TABLES FROM ' . PMA_Util::backquote($db) . ';', null, PMA_DBI_QUERY_STORE); @@ -58,7 +58,7 @@ if ($cfg['SkipLockedTables'] == true) { $tables[] = array('Name' => $tmp[0]); } } - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); $sot_ready = true; } } @@ -72,7 +72,7 @@ if (! isset($sot_ready)) { while ($sts_tmp = PMA_DBI_fetchAssoc($result)) { $tables[] = $sts_tmp; } - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); unset($res); } } diff --git a/libraries/DBQbe.class.php b/libraries/DBQbe.class.php index a9d0c9160d..fba751e046 100644 --- a/libraries/DBQbe.class.php +++ b/libraries/DBQbe.class.php @@ -296,7 +296,7 @@ class PMA_DbQbe } // end foreach } // end if } // end while - PMA_DBI_free_result($all_tables); + PMA_DBI_freeResult($all_tables); // sets the largest width found $this->_realwidth = $this->_form_column_width . 'ex'; diff --git a/libraries/DbSearch.class.php b/libraries/DbSearch.class.php index 8659bae9f7..a13541faf1 100644 --- a/libraries/DbSearch.class.php +++ b/libraries/DbSearch.class.php @@ -153,7 +153,7 @@ class PMA_DbSearch * * @todo can we make use of fulltextsearch IN BOOLEAN MODE for this? * PMA_backquote - * PMA_DBI_free_result + * PMA_DBI_freeResult * PMA_DBI_fetchAssoc * $GLOBALS['db'] * explode diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index dced3a2987..fcf1e78599 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -5517,7 +5517,7 @@ class PMA_DisplayResults $dispval = __('Link not found'); } - @PMA_DBI_free_result($dispresult); + @PMA_DBI_freeResult($dispresult); } else { $dispval = ''; diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php index f03d4956e6..441081643b 100644 --- a/libraries/List_Database.class.php +++ b/libraries/List_Database.class.php @@ -489,7 +489,7 @@ class PMA_List_Database extends PMA_List } // end if ... elseif ... } // end while } // end else - PMA_DBI_free_result($tmp_alldbs); + PMA_DBI_freeResult($tmp_alldbs); unset($tmp_mydbs); } // end if @@ -505,7 +505,7 @@ class PMA_List_Database extends PMA_List $dblist[] = $row['Db']; } } // end while - PMA_DBI_free_result($rs); + PMA_DBI_freeResult($rs); } // end if } } diff --git a/libraries/StorageEngine.class.php b/libraries/StorageEngine.class.php index 1881d4d761..ec69871027 100644 --- a/libraries/StorageEngine.class.php +++ b/libraries/StorageEngine.class.php @@ -279,7 +279,7 @@ class PMA_StorageEngine = PMA_ENGINE_DETAILS_TYPE_PLAINTEXT; } } - PMA_DBI_free_result($res); + PMA_DBI_freeResult($res); return $mysql_vars; } diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 67656eca94..7e10980486 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -552,7 +552,7 @@ class PMA_Table ); if (!PMA_DBI_getError()) { $row_count = PMA_DBI_num_rows($result); - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); } } } @@ -680,7 +680,7 @@ class PMA_Table $last_id = PMA_DBI_insert_id(); } // end while - PMA_DBI_free_result($table_copy_rs); + PMA_DBI_freeResult($table_copy_rs); return $last_id; } @@ -983,7 +983,7 @@ class PMA_Table . ')'; PMA_queryAsControlUser($new_comment_query); } // end while - PMA_DBI_free_result($comments_copy_rs); + PMA_DBI_freeResult($comments_copy_rs); unset($comments_copy_rs); } diff --git a/libraries/Util.class.php b/libraries/Util.class.php index 3f862ca395..49d483c661 100644 --- a/libraries/Util.class.php +++ b/libraries/Util.class.php @@ -3186,7 +3186,7 @@ class PMA_Util $srid = $wktarr[1]; $wktval = "'" . $wktval . "'," . $srid; } - @PMA_DBI_free_result($wktresult); + @PMA_DBI_freeResult($wktresult); return $wktval; } diff --git a/libraries/check_user_privileges.lib.php b/libraries/check_user_privileges.lib.php index 623b1f8573..e90914511a 100644 --- a/libraries/check_user_privileges.lib.php +++ b/libraries/check_user_privileges.lib.php @@ -135,7 +135,7 @@ function PMA_analyseShowGrant() } // end if } // end while - PMA_DBI_free_result($rs_usr); + PMA_DBI_freeResult($rs_usr); // must also cacheUnset() them in // libraries/plugins/auth/AuthenticationCookie.class.php diff --git a/libraries/core.lib.php b/libraries/core.lib.php index 3fd998d06e..67e89541da 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -329,7 +329,7 @@ function PMA_getTableCount($db) ); if ($tables) { $num_tables = PMA_DBI_num_rows($tables); - PMA_DBI_free_result($tables); + PMA_DBI_freeResult($tables); } else { $num_tables = 0; } diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index b58e31391e..87e9d6e25d 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -1002,7 +1002,7 @@ function PMA_DBI_getDatabasesFull($database = null, $force_stats = false, $databases[$database_name]['SCHEMA_LENGTH'] += $row['Data_length'] + $row['Index_length']; } - PMA_DBI_free_result($res); + PMA_DBI_freeResult($res); unset($res); } } @@ -1614,7 +1614,7 @@ function PMA_DBI_fetchValue($result, $row_number = 0, $field = 0, $link = null) for ($i = 0; $i <= $row_number; $i++) { $row = $fetch_function($result); } - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); // return requested field if (isset($row[$field])) { @@ -1669,7 +1669,7 @@ function PMA_DBI_fetchSingleRow($result, $type = 'ASSOC', $link = null) } $row = $fetch_function($result); - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); return $row; } @@ -1806,7 +1806,7 @@ function PMA_DBI_fetchResult($result, $key = null, $value = null, } } - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); return $resultrows; } diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php index 47a462629e..7419856545 100644 --- a/libraries/db_info.inc.php +++ b/libraries/db_info.inc.php @@ -78,7 +78,7 @@ if (true === $cfg['SkipLockedTables']) { $sot_cache[$tmp[0]] = true; } } - PMA_DBI_free_result($db_info_result); + PMA_DBI_freeResult($db_info_result); if (isset($sot_cache)) { $db_info_result = PMA_DBI_query( @@ -93,7 +93,7 @@ if (true === $cfg['SkipLockedTables']) { . ' LIKE \'' . PMA_Util::sqlAddSlashes($tmp[0], true) . '\';' ); $sts_tmp = PMA_DBI_fetchAssoc($sts_result); - PMA_DBI_free_result($sts_result); + PMA_DBI_freeResult($sts_result); unset($sts_result); if (! isset($sts_tmp['Type']) && isset($sts_tmp['Engine'])) { @@ -123,13 +123,13 @@ if (true === $cfg['SkipLockedTables']) { $sot_ready = true; } elseif ($db_info_result) { - PMA_DBI_free_result($db_info_result); + PMA_DBI_freeResult($db_info_result); } unset($sot_cache); } unset($tmp); } elseif ($db_info_result) { - PMA_DBI_free_result($db_info_result); + PMA_DBI_freeResult($db_info_result); } } diff --git a/libraries/db_table_exists.lib.php b/libraries/db_table_exists.lib.php index 8a7b50453f..add6e586d9 100644 --- a/libraries/db_table_exists.lib.php +++ b/libraries/db_table_exists.lib.php @@ -64,7 +64,7 @@ if (empty($is_table) null, PMA_DBI_QUERY_STORE ); $is_table = @PMA_DBI_num_rows($_result); - PMA_DBI_free_result($_result); + PMA_DBI_freeResult($_result); } } else { $is_table = false; @@ -87,7 +87,7 @@ if (empty($is_table) PMA_DBI_QUERY_STORE ); $is_table = ($_result && @PMA_DBI_num_rows($_result)); - PMA_DBI_free_result($_result); + PMA_DBI_freeResult($_result); } if (! $is_table) { diff --git a/libraries/dbi/drizzle.dbi.lib.php b/libraries/dbi/drizzle.dbi.lib.php index 0cd05169ed..31cee6ad64 100644 --- a/libraries/dbi/drizzle.dbi.lib.php +++ b/libraries/dbi/drizzle.dbi.lib.php @@ -251,7 +251,7 @@ function PMA_DBI_dataSeek($result, $offset) * * @return void */ -function PMA_DBI_free_result($result) +function PMA_DBI_freeResult($result) { if ($result instanceof PMA_DrizzleResult) { $result->free(); diff --git a/libraries/dbi/dummy.lib.php b/libraries/dbi/dummy.lib.php index 327a1c854e..736d529f51 100644 --- a/libraries/dbi/dummy.lib.php +++ b/libraries/dbi/dummy.lib.php @@ -428,7 +428,7 @@ function PMA_DBI_dataSeek($result, $offset) * * @return void */ -function PMA_DBI_free_result($result) +function PMA_DBI_freeResult($result) { return; } diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index 285256b2d5..bbc92175a5 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -276,7 +276,7 @@ function PMA_DBI_dataSeek($result, $offset) * * @return void */ -function PMA_DBI_free_result($result) +function PMA_DBI_freeResult($result) { if (is_resource($result) && get_resource_type($result) === 'mysql result') { mysql_free_result($result); diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index cddc7b1306..bf17f91f28 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -336,7 +336,7 @@ function PMA_DBI_dataSeek($result, $offset) * * @return void */ -function PMA_DBI_free_result($result) +function PMA_DBI_freeResult($result) { if ($result instanceof mysqli_result) { mysqli_free_result($result); diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index b5dcd8fdd9..06dd1e07bc 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -1938,7 +1938,7 @@ function PMA_executeSqlQuery($url_params, $query) $last_message->addParam($insert_id); $last_messages[] = $last_message; } - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); } $warning_messages = PMA_getWarningMessages(); } @@ -1997,7 +1997,7 @@ function PMA_getDisplayValueForForeignTableColumn($where_comparison, if ($dispresult && PMA_DBI_num_rows($dispresult) > 0) { list($dispval) = PMA_DBI_fetchRow($dispresult, 0); } - @PMA_DBI_free_result($dispresult); + @PMA_DBI_freeResult($dispresult); return $dispval; } return ''; diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index a78a1c35c4..bdfd9e0c75 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -95,7 +95,7 @@ if (! empty($submit_mult) $primary .= $row['Column_name'] . ', '; } } // end while - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); if (empty($primary)) { // no primary key, so we can safely create new unset($submit_mult); @@ -374,7 +374,7 @@ if (!empty($submit_mult) && !empty($what)) { $primary .= $row['Column_name'] . ', '; } } // end while - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); } $rebuild_database_list = false; diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php index 929bfa9add..39ff57916a 100644 --- a/libraries/mysql_charsets.lib.php +++ b/libraries/mysql_charsets.lib.php @@ -29,7 +29,7 @@ if (! PMA_Util::cacheExists('mysql_charsets', true)) { $mysql_charsets_descriptions[$row['CHARACTER_SET_NAME']] = $row['DESCRIPTION']; } - PMA_DBI_free_result($res); + PMA_DBI_freeResult($res); sort($mysql_charsets, SORT_STRING); @@ -60,7 +60,7 @@ if (! PMA_Util::cacheExists('mysql_charsets', true)) { = !empty($mysql_charsets_available[$row['CHARACTER_SET_NAME']]) || !empty($mysql_collations_available[$row['COLLATION_NAME']]); } - PMA_DBI_free_result($res); + PMA_DBI_freeResult($res); unset($res, $row); if (PMA_DRIZZLE diff --git a/libraries/plugins/export/ExportCodegen.class.php b/libraries/plugins/export/ExportCodegen.class.php index 9b342be84d..fa007d5662 100644 --- a/libraries/plugins/export/ExportCodegen.class.php +++ b/libraries/plugins/export/ExportCodegen.class.php @@ -255,7 +255,7 @@ class ExportCodegen extends ExportPlugin while ($row = PMA_DBI_fetchRow($result)) { $tableProperties[] = new TableProperty($row); } - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); $lines[] = 'using System;'; $lines[] = 'using System.Collections;'; $lines[] = 'using System.Collections.Generic;'; @@ -365,7 +365,7 @@ class ExportCodegen extends ExportPlugin ); } } - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); } $lines[] = ' '; $lines[] = ''; diff --git a/libraries/plugins/export/ExportCsv.class.php b/libraries/plugins/export/ExportCsv.class.php index a8b52469f9..bb06ac6c59 100644 --- a/libraries/plugins/export/ExportCsv.class.php +++ b/libraries/plugins/export/ExportCsv.class.php @@ -336,7 +336,7 @@ class ExportCsv extends ExportPlugin return false; } } // end while - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); return true; } diff --git a/libraries/plugins/export/ExportHtmlword.class.php b/libraries/plugins/export/ExportHtmlword.class.php index fd7421a42a..a065bdf17d 100644 --- a/libraries/plugins/export/ExportHtmlword.class.php +++ b/libraries/plugins/export/ExportHtmlword.class.php @@ -251,7 +251,7 @@ class ExportHtmlword extends ExportPlugin return false; } } // end while - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); if (! PMA_exportOutputHandler('
')) { return false; } diff --git a/libraries/plugins/export/ExportJson.class.php b/libraries/plugins/export/ExportJson.class.php index b74ccb52b7..b52181dcf2 100644 --- a/libraries/plugins/export/ExportJson.class.php +++ b/libraries/plugins/export/ExportJson.class.php @@ -214,7 +214,7 @@ class ExportJson extends ExportPlugin return false; } - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); return true; } } diff --git a/libraries/plugins/export/ExportLatex.class.php b/libraries/plugins/export/ExportLatex.class.php index 0c9799b918..57c1b88f23 100644 --- a/libraries/plugins/export/ExportLatex.class.php +++ b/libraries/plugins/export/ExportLatex.class.php @@ -403,7 +403,7 @@ class ExportLatex extends ExportPlugin return false; } - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); return true; } // end getTableLaTeX diff --git a/libraries/plugins/export/ExportOds.class.php b/libraries/plugins/export/ExportOds.class.php index 4c8a3f4737..88371da92b 100644 --- a/libraries/plugins/export/ExportOds.class.php +++ b/libraries/plugins/export/ExportOds.class.php @@ -324,7 +324,7 @@ class ExportOds extends ExportPlugin } // end for $GLOBALS['ods_buffer'] .= ''; } // end while - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); $GLOBALS['ods_buffer'] .= ''; diff --git a/libraries/plugins/export/ExportOdt.class.php b/libraries/plugins/export/ExportOdt.class.php index aefec3a0c4..2f243aab81 100644 --- a/libraries/plugins/export/ExportOdt.class.php +++ b/libraries/plugins/export/ExportOdt.class.php @@ -319,7 +319,7 @@ class ExportOdt extends ExportPlugin } // end for $GLOBALS['odt_buffer'] .= ''; } // end while - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); $GLOBALS['odt_buffer'] .= ''; diff --git a/libraries/plugins/export/ExportPhparray.class.php b/libraries/plugins/export/ExportPhparray.class.php index dde5e1713a..3f0ebe8bf8 100644 --- a/libraries/plugins/export/ExportPhparray.class.php +++ b/libraries/plugins/export/ExportPhparray.class.php @@ -219,7 +219,7 @@ class ExportPhparray extends ExportPlugin return false; } - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); return true; } } diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php index 11e1972657..f64fc3dc83 100644 --- a/libraries/plugins/export/ExportSql.class.php +++ b/libraries/plugins/export/ExportSql.class.php @@ -977,7 +977,7 @@ class ExportSql extends ExportPlugin $new_crlf = $this->_exportComment() . $crlf; } } - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); } $schema_create .= $new_crlf; @@ -1295,7 +1295,7 @@ class ExportSql extends ExportPlugin $schema_create .= ($compat != 'MSSQL') ? $auto_increment : ''; - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); return $schema_create . ($add_semicolon ? ';' . $crlf : ''); } // end of the 'getTableDef()' function @@ -1869,7 +1869,7 @@ class ExportSql extends ExportPlugin } } } // end if ($result != false) - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); return true; } // end of the 'exportData()' function diff --git a/libraries/plugins/export/ExportTexytext.class.php b/libraries/plugins/export/ExportTexytext.class.php index c3dd401e04..8a8735889a 100644 --- a/libraries/plugins/export/ExportTexytext.class.php +++ b/libraries/plugins/export/ExportTexytext.class.php @@ -227,7 +227,7 @@ class ExportTexytext extends ExportPlugin return false; } } // end while - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); return true; } diff --git a/libraries/plugins/export/ExportXml.class.php b/libraries/plugins/export/ExportXml.class.php index a11c53c8fe..d744819313 100644 --- a/libraries/plugins/export/ExportXml.class.php +++ b/libraries/plugins/export/ExportXml.class.php @@ -479,7 +479,7 @@ class ExportXml extends ExportPlugin return false; } } - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); } return true; diff --git a/libraries/plugins/export/ExportYaml.class.php b/libraries/plugins/export/ExportYaml.class.php index 3f32eb84d3..ffc64d5608 100644 --- a/libraries/plugins/export/ExportYaml.class.php +++ b/libraries/plugins/export/ExportYaml.class.php @@ -206,7 +206,7 @@ class ExportYaml extends ExportPlugin return false; } } - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); return true; } // end getTableYAML diff --git a/libraries/plugins/export/PMA_ExportPdf.class.php b/libraries/plugins/export/PMA_ExportPdf.class.php index 940930f17f..e1f266b917 100644 --- a/libraries/plugins/export/PMA_ExportPdf.class.php +++ b/libraries/plugins/export/PMA_ExportPdf.class.php @@ -391,7 +391,7 @@ class PMA_ExportPdf extends PMA_PDF ksort($this->tablewidths); - PMA_DBI_free_result($this->results); + PMA_DBI_freeResult($this->results); // Pass 2 @@ -400,7 +400,7 @@ class PMA_ExportPdf extends PMA_PDF $this->AddPage(); $this->SetFont(PMA_PDF_FONT, '', 9); $this->morepagestable($this->FontSizePt); - PMA_DBI_free_result($this->results); + PMA_DBI_freeResult($this->results); } // end of mysqlReport function diff --git a/libraries/plugins/import/ImportLdi.class.php b/libraries/plugins/import/ImportLdi.class.php index c90991731b..84ff8b00f1 100644 --- a/libraries/plugins/import/ImportLdi.class.php +++ b/libraries/plugins/import/ImportLdi.class.php @@ -53,7 +53,7 @@ class ImportLdi extends AbstractImportCsv $GLOBALS['cfg']['Import']['ldi_local_option'] = true; } } - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); unset($result); } diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 87cc33cd84..92ec7698a8 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -422,7 +422,7 @@ function PMA__getRelationsParam() $cfgRelation['userconfig'] = $curr_table[0]; } } // end while - PMA_DBI_free_result($tab_rs); + PMA_DBI_freeResult($tab_rs); if (isset($cfgRelation['relation'])) { $cfgRelation['relwork'] = true; @@ -708,7 +708,7 @@ function PMA_getDbComment($db) $row = PMA_DBI_fetchAssoc($com_rs); $comment = $row['comment']; } - PMA_DBI_free_result($com_rs); + PMA_DBI_freeResult($com_rs); } return $comment; @@ -740,7 +740,7 @@ function PMA_getDbComments() $comments[$row['db_name']] = $row['comment']; } } - PMA_DBI_free_result($com_rs); + PMA_DBI_freeResult($com_rs); } return $comments; @@ -1128,7 +1128,7 @@ function PMA_getForeignData($foreigners, $field, $override_total, $foreign_filte $res = PMA_DBI_query('SELECT COUNT(*)' . $f_query_from . $f_query_filter); if ($res) { $the_total = PMA_DBI_fetchValue($res); - @PMA_DBI_free_result($res); + @PMA_DBI_freeResult($res); } else { $the_total = 0; } @@ -1144,7 +1144,7 @@ function PMA_getForeignData($foreigners, $field, $override_total, $foreign_filte while ($single_disp_row = @PMA_DBI_fetchAssoc($disp)) { $disp_row[] = $single_disp_row; } - @PMA_DBI_free_result($disp); + @PMA_DBI_freeResult($disp); } } else { $disp_row = null; diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index a4b470d369..9401c6a423 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -1415,7 +1415,7 @@ function PMA_RTN_handleExecute() $output .= "
"; - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); } while (PMA_DBI_next_result()); diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php index d271f283d5..a601ad1bfb 100644 --- a/libraries/schema/Pdf_Relation_Schema.class.php +++ b/libraries/schema/Pdf_Relation_Schema.class.php @@ -1301,7 +1301,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema } } // end while if ($result) { - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); } /** diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index 18cef0610e..2a638387d7 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -431,7 +431,7 @@ class PMA_User_Schema echo ' ' . "\n"; } // end while - PMA_DBI_free_result($test_rs); + PMA_DBI_freeResult($test_rs); unset($test_rs); ?>
diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index c986149dcd..5addee637e 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -405,7 +405,7 @@ function PMA_getHtmlToDisplayPrivilegesTable($db = '*', $row[$row1[0]] = 'N'; } } - PMA_DBI_free_result($res); + PMA_DBI_freeResult($res); } else { $row = array('Table_priv' => ''); } @@ -455,7 +455,7 @@ function PMA_getHtmlToDisplayPrivilegesTable($db = '*', 'References' => false ); } - PMA_DBI_free_result($res); + PMA_DBI_freeResult($res); } unset($res, $row1); } @@ -590,7 +590,7 @@ function PMA_getHtmlForTableSpecificPrivileges($username, $hostname, $db, $columns[$row1[0]][$current] = true; } } - PMA_DBI_free_result($res); + PMA_DBI_freeResult($res); unset($res, $row1, $current); $html_output = 'getDisplay(); - PMA_DBI_free_result($res); + PMA_DBI_freeResult($res); unset($res); } else { // This message is hardcoded because I will replace it by @@ -3209,7 +3209,7 @@ function PMA_getDbSpecificPrivsQueriesForChangeOrCopyUser( . '\'@\'' . PMA_Util::sqlAddSlashes($hostname) . '\'' . ($row['Grant_priv'] == 'Y' ? ' WITH GRANT OPTION;' : ';'); } - PMA_DBI_free_result($res); + PMA_DBI_freeResult($res); $queries = PMA_getTablePrivsQueriesForChangeOrCopyUser( $user_host_condition, $queries, $username, $hostname diff --git a/libraries/transformations.lib.php b/libraries/transformations.lib.php index ada9622297..9c7c7f1ba6 100644 --- a/libraries/transformations.lib.php +++ b/libraries/transformations.lib.php @@ -284,7 +284,7 @@ function PMA_setMIME($db, $table, $key, $mimetype, $transformation, if ($test_rs && PMA_DBI_num_rows($test_rs) > 0) { $row = @PMA_DBI_fetchAssoc($test_rs); - PMA_DBI_free_result($test_rs); + PMA_DBI_freeResult($test_rs); if (! $forcedelete && (strlen($mimetype) || strlen($transformation) diff --git a/pmd_relation_new.php b/pmd_relation_new.php index af6708d2c4..cff413fb62 100644 --- a/pmd_relation_new.php +++ b/pmd_relation_new.php @@ -45,7 +45,7 @@ if (PMA_Util::isForeignKeySupported($type_T1) while ($row = PMA_DBI_fetchAssoc($result)) { $index_array1[$row['Column_name']] = 1; } - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); $result = PMA_DBI_query( 'SHOW INDEX FROM ' . PMA_Util::backquote($db) @@ -55,7 +55,7 @@ if (PMA_Util::isForeignKeySupported($type_T1) while ($row = PMA_DBI_fetchAssoc($result)) { $index_array2[$row['Column_name']] = 1; } - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); if (! empty($index_array1[$F1]) && ! empty($index_array2[$F2])) { $upd_query = 'ALTER TABLE ' . PMA_Util::backquote($db) diff --git a/server_plugins.php b/server_plugins.php index b4514424a5..74c9e7d2eb 100644 --- a/server_plugins.php +++ b/server_plugins.php @@ -48,7 +48,7 @@ while ($row = PMA_DBI_fetchAssoc($res)) { $modules[$row['module_name']]['info'] = $row; $modules[$row['module_name']]['plugins'][$row['plugin_type']][] = $row; } -PMA_DBI_free_result($res); +PMA_DBI_freeResult($res); // sort plugin list (modules are already sorted) ksort($plugins); diff --git a/server_status_monitor.php b/server_status_monitor.php index 80ef6808a7..81f2952642 100644 --- a/server_status_monitor.php +++ b/server_status_monitor.php @@ -213,7 +213,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { $return['sum']['TOTAL'] = array_sum($return['sum']); $return['numRows'] = count($return['rows']); - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); PMA_Response::getInstance()->addJSON('message', $return); exit; @@ -313,7 +313,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { $return['sum']['TOTAL'] = array_sum($return['sum']); $return['numRows'] = count($return['rows']); - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); PMA_Response::getInstance()->addJSON('message', $return); exit; @@ -374,7 +374,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { // In case an error happened $return['error'] = PMA_DBI_getError(); - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); if ($profiling) { $return['profiling'] = array(); @@ -385,7 +385,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { while ($row = PMA_DBI_fetchAssoc($result)) { $return['profiling'][]= $row; } - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); } PMA_Response::getInstance()->addJSON('message', $return); diff --git a/sql.php b/sql.php index 80d9739280..36e9114a80 100644 --- a/sql.php +++ b/sql.php @@ -1271,7 +1271,7 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) { ); $html_output .= $displayResultsObject->getTable($result, $disp_mode, $analyzed_sql); - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); } // BEGIN INDEX CHECK See if indexes should be checked. @@ -1609,7 +1609,7 @@ function getTableHtmlForMultipleQueries( ); // Free the result to save the memory - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); $sql_no++; diff --git a/tbl_create.php b/tbl_create.php index c04929a397..510e16a191 100644 --- a/tbl_create.php +++ b/tbl_create.php @@ -269,7 +269,7 @@ if (isset($_REQUEST['do_save_data'])) { . ' LIKE \'' . PMA_Util::sqlAddSlashes($table, true) . '\';' ); $tbl_stats = PMA_DBI_fetchAssoc($tbl_stats_result); - PMA_DBI_free_result($tbl_stats_result); + PMA_DBI_freeResult($tbl_stats_result); unset($tbl_stats_result); if ($is_show_stats) { From f92627ed888287071df10a996a63e4d69eda6d23 Mon Sep 17 00:00:00 2001 From: Kasun Chathuranga Date: Sat, 4 May 2013 08:34:30 +0530 Subject: [PATCH 11/36] PMA_DBI_more_results --> PMA_DBI_moreResults --- libraries/dbi/drizzle.dbi.lib.php | 2 +- libraries/dbi/dummy.lib.php | 2 +- libraries/dbi/mysql.dbi.lib.php | 2 +- libraries/dbi/mysqli.dbi.lib.php | 2 +- libraries/rte/rte_routines.lib.php | 2 +- sql.php | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libraries/dbi/drizzle.dbi.lib.php b/libraries/dbi/drizzle.dbi.lib.php index 31cee6ad64..47fcba5a91 100644 --- a/libraries/dbi/drizzle.dbi.lib.php +++ b/libraries/dbi/drizzle.dbi.lib.php @@ -263,7 +263,7 @@ function PMA_DBI_freeResult($result) * * @return bool false */ -function PMA_DBI_more_results() +function PMA_DBI_moreResults() { // N.B.: PHP's 'mysql' extension does not support // multi_queries so this function will always diff --git a/libraries/dbi/dummy.lib.php b/libraries/dbi/dummy.lib.php index 736d529f51..d738a72e91 100644 --- a/libraries/dbi/dummy.lib.php +++ b/libraries/dbi/dummy.lib.php @@ -438,7 +438,7 @@ function PMA_DBI_freeResult($result) * * @return bool false */ -function PMA_DBI_more_results() +function PMA_DBI_moreResults() { return false; } diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index bbc92175a5..ac03a65255 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -288,7 +288,7 @@ function PMA_DBI_freeResult($result) * * @return bool false */ -function PMA_DBI_more_results() +function PMA_DBI_moreResults() { // N.B.: PHP's 'mysql' extension does not support // multi_queries so this function will always diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index bf17f91f28..110f59d33a 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -350,7 +350,7 @@ function PMA_DBI_freeResult($result) * * @return bool true or false */ -function PMA_DBI_more_results($link = null) +function PMA_DBI_moreResults($link = null) { if (empty($link)) { if (isset($GLOBALS['userlink'])) { diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index 9401c6a423..972904b0a8 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -1409,7 +1409,7 @@ function PMA_RTN_handleExecute() } - if (! PMA_DBI_more_results()) { + if (! PMA_DBI_moreResults()) { break; } diff --git a/sql.php b/sql.php index 36e9114a80..75bdd8639c 100644 --- a/sql.php +++ b/sql.php @@ -640,7 +640,7 @@ if (isset($GLOBALS['show_as_php']) || ! empty($GLOBALS['validatequery'])) { // queued up and waiting to be flushed from the buffer. So let's do that. do { PMA_DBI_store_result(); - if (! PMA_DBI_more_results()) { + if (! PMA_DBI_moreResults()) { break; } } while (PMA_DBI_next_result()); @@ -1613,7 +1613,7 @@ function getTableHtmlForMultipleQueries( $sql_no++; - } while (PMA_DBI_more_results() && PMA_DBI_next_result()); + } while (PMA_DBI_moreResults() && PMA_DBI_next_result()); return $table_html; } From 5d9f92f7bcd1b14655e82a03facfc9562b6b59de Mon Sep 17 00:00:00 2001 From: Kasun Chathuranga Date: Sat, 4 May 2013 08:35:16 +0530 Subject: [PATCH 12/36] PMA_DBI_next_result --> PMA_DBI_nextResult --- libraries/dbi/drizzle.dbi.lib.php | 2 +- libraries/dbi/dummy.lib.php | 2 +- libraries/dbi/mysql.dbi.lib.php | 2 +- libraries/dbi/mysqli.dbi.lib.php | 2 +- libraries/rte/rte_routines.lib.php | 2 +- sql.php | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libraries/dbi/drizzle.dbi.lib.php b/libraries/dbi/drizzle.dbi.lib.php index 47fcba5a91..143f22454b 100644 --- a/libraries/dbi/drizzle.dbi.lib.php +++ b/libraries/dbi/drizzle.dbi.lib.php @@ -277,7 +277,7 @@ function PMA_DBI_moreResults() * * @return bool false */ -function PMA_DBI_next_result() +function PMA_DBI_nextResult() { // N.B.: PHP's 'mysql' extension does not support // multi_queries so this function will always diff --git a/libraries/dbi/dummy.lib.php b/libraries/dbi/dummy.lib.php index d738a72e91..c1a99a8b7e 100644 --- a/libraries/dbi/dummy.lib.php +++ b/libraries/dbi/dummy.lib.php @@ -448,7 +448,7 @@ function PMA_DBI_moreResults() * * @return boo false */ -function PMA_DBI_next_result() +function PMA_DBI_nextResult() { return false; } diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index ac03a65255..7135892adb 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -302,7 +302,7 @@ function PMA_DBI_moreResults() * * @return boo false */ -function PMA_DBI_next_result() +function PMA_DBI_nextResult() { // N.B.: PHP's 'mysql' extension does not support // multi_queries so this function will always diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 110f59d33a..0009cff8cc 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -369,7 +369,7 @@ function PMA_DBI_moreResults($link = null) * * @return bool true or false */ -function PMA_DBI_next_result($link = null) +function PMA_DBI_nextResult($link = null) { if (empty($link)) { if (isset($GLOBALS['userlink'])) { diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index 972904b0a8..fa9f112be6 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -1417,7 +1417,7 @@ function PMA_RTN_handleExecute() PMA_DBI_freeResult($result); - } while (PMA_DBI_next_result()); + } while (PMA_DBI_nextResult()); $output .= ""; diff --git a/sql.php b/sql.php index 75bdd8639c..d2c62a234e 100644 --- a/sql.php +++ b/sql.php @@ -643,7 +643,7 @@ if (isset($GLOBALS['show_as_php']) || ! empty($GLOBALS['validatequery'])) { if (! PMA_DBI_moreResults()) { break; } - } while (PMA_DBI_next_result()); + } while (PMA_DBI_nextResult()); $is_procedure = false; if (stripos($full_sql_query, 'call') !== false) { @@ -1613,7 +1613,7 @@ function getTableHtmlForMultipleQueries( $sql_no++; - } while (PMA_DBI_moreResults() && PMA_DBI_next_result()); + } while (PMA_DBI_moreResults() && PMA_DBI_nextResult()); return $table_html; } From 5bc8b71eda79897ad35c9b81752a99b7e775209a Mon Sep 17 00:00:00 2001 From: Kasun Chathuranga Date: Sat, 4 May 2013 08:36:11 +0530 Subject: [PATCH 13/36] PMA_DBI_get_host_info --> PMA_DBI_getHostInfo --- index.php | 2 +- libraries/dbi/drizzle.dbi.lib.php | 2 +- libraries/dbi/mysql.dbi.lib.php | 2 +- libraries/dbi/mysqli.dbi.lib.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/index.php b/index.php index 782c9c3f71..99a565447d 100644 --- a/index.php +++ b/index.php @@ -92,7 +92,7 @@ if ($server > 0) { } } if ($GLOBALS['cfg']['ShowServerInfo'] || empty($cfg['Server']['verbose'])) { - $server_info .= PMA_DBI_get_host_info(); + $server_info .= PMA_DBI_getHostInfo(); } if (! empty($cfg['Server']['verbose']) && $GLOBALS['cfg']['ShowServerInfo']) { $server_info .= ')'; diff --git a/libraries/dbi/drizzle.dbi.lib.php b/libraries/dbi/drizzle.dbi.lib.php index 143f22454b..db8cc2260f 100644 --- a/libraries/dbi/drizzle.dbi.lib.php +++ b/libraries/dbi/drizzle.dbi.lib.php @@ -293,7 +293,7 @@ function PMA_DBI_nextResult() * * @return string type of connection used */ -function PMA_DBI_get_host_info($link = null) +function PMA_DBI_getHostInfo($link = null) { if (null === $link) { if (isset($GLOBALS['userlink'])) { diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index 7135892adb..add33c31d3 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -318,7 +318,7 @@ function PMA_DBI_nextResult() * * @return string type of connection used */ -function PMA_DBI_get_host_info($link = null) +function PMA_DBI_getHostInfo($link = null) { if (null === $link) { if (isset($GLOBALS['userlink'])) { diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 0009cff8cc..a9cb4a79c3 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -405,7 +405,7 @@ function PMA_DBI_store_result() * * @return string type of connection used */ -function PMA_DBI_get_host_info($link = null) +function PMA_DBI_getHostInfo($link = null) { if (null === $link) { if (isset($GLOBALS['userlink'])) { From b0c52a8729e3eaef57b12148ea8242ef803ff267 Mon Sep 17 00:00:00 2001 From: Kasun Chathuranga Date: Sat, 4 May 2013 08:36:58 +0530 Subject: [PATCH 14/36] PMA_DBI_get_proto_info --> PMA_DBI_getProtoInfo --- index.php | 2 +- libraries/dbi/drizzle.dbi.lib.php | 2 +- libraries/dbi/mysql.dbi.lib.php | 2 +- libraries/dbi/mysqli.dbi.lib.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/index.php b/index.php index 99a565447d..92a0b3dfc4 100644 --- a/index.php +++ b/index.php @@ -245,7 +245,7 @@ if ($server > 0 && $GLOBALS['cfg']['ShowServerInfo']) { 'li_server_version' ); PMA_printListItem( - __('Protocol version:') . ' ' . PMA_DBI_get_proto_info(), + __('Protocol version:') . ' ' . PMA_DBI_getProtoInfo(), 'li_mysql_proto' ); PMA_printListItem( diff --git a/libraries/dbi/drizzle.dbi.lib.php b/libraries/dbi/drizzle.dbi.lib.php index db8cc2260f..ed1d5732d9 100644 --- a/libraries/dbi/drizzle.dbi.lib.php +++ b/libraries/dbi/drizzle.dbi.lib.php @@ -316,7 +316,7 @@ function PMA_DBI_getHostInfo($link = null) * * @return int version of the Drizzle protocol used */ -function PMA_DBI_get_proto_info($link = null) +function PMA_DBI_getProtoInfo($link = null) { if (null === $link) { if (isset($GLOBALS['userlink'])) { diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index add33c31d3..b6339dc4c4 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -337,7 +337,7 @@ function PMA_DBI_getHostInfo($link = null) * * @return int version of the MySQL protocol used */ -function PMA_DBI_get_proto_info($link = null) +function PMA_DBI_getProtoInfo($link = null) { if (null === $link) { if (isset($GLOBALS['userlink'])) { diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index a9cb4a79c3..dd135ecd40 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -424,7 +424,7 @@ function PMA_DBI_getHostInfo($link = null) * * @return integer version of the MySQL protocol used */ -function PMA_DBI_get_proto_info($link = null) +function PMA_DBI_getProtoInfo($link = null) { if (null === $link) { if (isset($GLOBALS['userlink'])) { From 99c5c0ef4963bc53094323cc8c85ce7a27992275 Mon Sep 17 00:00:00 2001 From: Kasun Chathuranga Date: Sat, 4 May 2013 08:37:58 +0530 Subject: [PATCH 15/36] PMA_DBI_get_client_info --> PMA_DBI_getClientInfo --- index.php | 8 ++++---- libraries/dbi/drizzle.dbi.lib.php | 2 +- libraries/dbi/mysql.dbi.lib.php | 2 +- libraries/dbi/mysqli.dbi.lib.php | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/index.php b/index.php index 92a0b3dfc4..128cb5e64c 100644 --- a/index.php +++ b/index.php @@ -272,7 +272,7 @@ if ($GLOBALS['cfg']['ShowServerInfo'] || $GLOBALS['cfg']['ShowPhpInfo']) { PMA_printListItem($_SERVER['SERVER_SOFTWARE'], 'li_web_server_software'); if ($server > 0) { - $client_version_str = PMA_DBI_get_client_info(); + $client_version_str = PMA_DBI_getClientInfo(); if (preg_match('#\d+\.\d+\.\d+#', $client_version_str) && in_array($GLOBALS['cfg']['Server']['extension'], array('mysql', 'mysqli')) ) { @@ -486,12 +486,12 @@ if ($server > 0) { * (a difference on the third digit does not count). * If someday there is a constant that we can check about mysqlnd, * we can use it instead of strpos(). - * If no default server is set, PMA_DBI_get_client_info() is not defined yet. + * If no default server is set, PMA_DBI_getClientInfo() is not defined yet. * Drizzle can speak MySQL protocol, so don't warn about version mismatch for * Drizzle servers. */ -if (function_exists('PMA_DBI_get_client_info') && !PMA_DRIZZLE) { - $_client_info = PMA_DBI_get_client_info(); +if (function_exists('PMA_DBI_getClientInfo') && !PMA_DRIZZLE) { + $_client_info = PMA_DBI_getClientInfo(); if ($server > 0 && strpos($_client_info, 'mysqlnd') === false && substr(PMA_MYSQL_CLIENT_API, 0, 3) != substr(PMA_MYSQL_INT_VERSION, 0, 3) diff --git a/libraries/dbi/drizzle.dbi.lib.php b/libraries/dbi/drizzle.dbi.lib.php index ed1d5732d9..97c519aba9 100644 --- a/libraries/dbi/drizzle.dbi.lib.php +++ b/libraries/dbi/drizzle.dbi.lib.php @@ -334,7 +334,7 @@ function PMA_DBI_getProtoInfo($link = null) * * @return string Drizzle client library version */ -function PMA_DBI_get_client_info() +function PMA_DBI_getClientInfo() { return 'libdrizzle (Drizzle ' . drizzle_version() . ')'; } diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index b6339dc4c4..66de7e5c04 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -354,7 +354,7 @@ function PMA_DBI_getProtoInfo($link = null) * * @return string MySQL client library version */ -function PMA_DBI_get_client_info() +function PMA_DBI_getClientInfo() { return mysql_get_client_info(); } diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index dd135ecd40..731ff7ab8a 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -441,7 +441,7 @@ function PMA_DBI_getProtoInfo($link = null) * * @return string MySQL client library version */ -function PMA_DBI_get_client_info() +function PMA_DBI_getClientInfo() { return mysqli_get_client_info(); } From 556bcb9f9de9f6ae8efa8ee86177842f71b7e280 Mon Sep 17 00:00:00 2001 From: Kasun Chathuranga Date: Sat, 4 May 2013 08:39:43 +0530 Subject: [PATCH 16/36] PMA_DBI_num_rows --> PMA_DBI_numRows --- db_printview.php | 6 +++--- db_tracking.php | 2 +- libraries/DBQbe.class.php | 2 +- libraries/DisplayResults.class.php | 2 +- libraries/List_Database.class.php | 2 +- libraries/Table.class.php | 2 +- libraries/core.lib.php | 2 +- libraries/database_interface.lib.php | 4 ++-- libraries/db_info.inc.php | 4 ++-- libraries/db_table_exists.lib.php | 4 ++-- libraries/dbi/drizzle.dbi.lib.php | 2 +- libraries/dbi/dummy.lib.php | 2 +- libraries/dbi/mysql.dbi.lib.php | 2 +- libraries/dbi/mysqli.dbi.lib.php | 2 +- libraries/import.lib.php | 2 +- libraries/insert_edit.lib.php | 2 +- libraries/navigation/Nodes/Node.class.php | 2 +- libraries/navigation/Nodes/Node_Database.class.php | 10 +++++----- libraries/navigation/Nodes/Node_Table.class.php | 6 +++--- libraries/plugins/export/ExportSql.class.php | 4 ++-- libraries/plugins/import/ImportLdi.class.php | 2 +- libraries/relation.lib.php | 6 +++--- libraries/rte/rte_routines.lib.php | 2 +- libraries/schema/Dia_Relation_Schema.class.php | 6 +++--- libraries/schema/Eps_Relation_Schema.class.php | 6 +++--- libraries/schema/Export_Relation_Schema.class.php | 2 +- libraries/schema/Pdf_Relation_Schema.class.php | 6 +++--- libraries/schema/Svg_Relation_Schema.class.php | 6 +++--- libraries/schema/User_Schema.class.php | 6 +++--- libraries/schema/Visio_Relation_Schema.class.php | 6 +++--- libraries/server_privileges.lib.php | 4 ++-- libraries/transformations.lib.php | 2 +- pmd_pdf.php | 2 +- server_binlog.php | 2 +- server_status_monitor.php | 2 +- sql.php | 4 ++-- tbl_relation.php | 2 +- tbl_tracking.php | 2 +- 38 files changed, 66 insertions(+), 66 deletions(-) diff --git a/db_printview.php b/db_printview.php index 220a263347..3f4fa4b807 100644 --- a/db_printview.php +++ b/db_printview.php @@ -37,7 +37,7 @@ $cfgRelation = PMA_getRelationsParam(); if ($cfg['SkipLockedTables'] == true) { $result = PMA_DBI_query('SHOW OPEN TABLES FROM ' . PMA_Util::backquote($db) . ';'); // Blending out tables in use - if ($result != false && PMA_DBI_num_rows($result) > 0) { + if ($result != false && PMA_DBI_numRows($result) > 0) { while ($tmp = PMA_DBI_fetchRow($result)) { // if in use memorize tablename if (preg_match('@in_use=[1-9]+@i', $tmp[0])) { @@ -48,7 +48,7 @@ if ($cfg['SkipLockedTables'] == true) { if (isset($sot_cache)) { $result = PMA_DBI_query('SHOW TABLES FROM ' . PMA_Util::backquote($db) . ';', null, PMA_DBI_QUERY_STORE); - if ($result != false && PMA_DBI_num_rows($result) > 0) { + if ($result != false && PMA_DBI_numRows($result) > 0) { while ($tmp = PMA_DBI_fetchRow($result)) { if (! isset($sot_cache[$tmp[0]])) { $sts_result = PMA_DBI_query('SHOW TABLE STATUS FROM ' . PMA_Util::backquote($db) . ' LIKE \'' . sqlAddSlashes($tmp[0], true) . '\';'); @@ -68,7 +68,7 @@ if ($cfg['SkipLockedTables'] == true) { if (! isset($sot_ready)) { $result = PMA_DBI_query('SHOW TABLE STATUS FROM ' . PMA_Util::backquote($db) . ';'); - if (PMA_DBI_num_rows($result) > 0) { + if (PMA_DBI_numRows($result) > 0) { while ($sts_tmp = PMA_DBI_fetchAssoc($result)) { $tables[] = $sts_tmp; } diff --git a/db_tracking.php b/db_tracking.php index 21d04dfdbb..3bc956a1d7 100644 --- a/db_tracking.php +++ b/db_tracking.php @@ -67,7 +67,7 @@ $all_tables_query = ' SELECT table_name, MAX(version) as version FROM ' . $all_tables_result = PMA_queryAsControlUser($all_tables_query); // If a HEAD version exists -if (PMA_DBI_num_rows($all_tables_result) > 0) { +if (PMA_DBI_numRows($all_tables_result) > 0) { ?>

diff --git a/libraries/DBQbe.class.php b/libraries/DBQbe.class.php index fba751e046..13ba4a1346 100644 --- a/libraries/DBQbe.class.php +++ b/libraries/DBQbe.class.php @@ -263,7 +263,7 @@ class PMA_DbQbe null, PMA_DBI_QUERY_STORE ); - $all_tables_count = PMA_DBI_num_rows($all_tables); + $all_tables_count = PMA_DBI_numRows($all_tables); if (0 == $all_tables_count) { PMA_Message::error(__('No tables found in database.'))->display(); exit; diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index fcf1e78599..d8cc1b78d8 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -5511,7 +5511,7 @@ class PMA_DisplayResults $dispresult = PMA_DBI_tryQuery($dispsql, null, PMA_DBI_QUERY_STORE); - if ($dispresult && PMA_DBI_num_rows($dispresult) > 0) { + if ($dispresult && PMA_DBI_numRows($dispresult) > 0) { list($dispval) = PMA_DBI_fetchRow($dispresult, 0); } else { $dispval = __('Link not found'); diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php index 441081643b..685f65f11e 100644 --- a/libraries/List_Database.class.php +++ b/libraries/List_Database.class.php @@ -499,7 +499,7 @@ class PMA_List_Database extends PMA_List $local_query .= ' AND `User` = \''; $local_query .= PMA_Util::sqlAddSlashes($GLOBALS['cfg']['Server']['user']) . '\''; $rs = PMA_DBI_tryQuery($local_query, $GLOBALS['controllink']); - if ($rs && @PMA_DBI_num_rows($rs)) { + if ($rs && @PMA_DBI_numRows($rs)) { while ($row = PMA_DBI_fetchAssoc($rs)) { if (!in_array($row['Db'], $dblist)) { $dblist[] = $row['Db']; diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 7e10980486..190f3f4d7c 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -551,7 +551,7 @@ class PMA_Table PMA_DBI_QUERY_STORE ); if (!PMA_DBI_getError()) { - $row_count = PMA_DBI_num_rows($result); + $row_count = PMA_DBI_numRows($result); PMA_DBI_freeResult($result); } } diff --git a/libraries/core.lib.php b/libraries/core.lib.php index 67e89541da..9ca9ad22fb 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -328,7 +328,7 @@ function PMA_getTableCount($db) null, PMA_DBI_QUERY_STORE ); if ($tables) { - $num_tables = PMA_DBI_num_rows($tables); + $num_tables = PMA_DBI_numRows($tables); PMA_DBI_freeResult($tables); } else { $num_tables = 0; diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 87e9d6e25d..c32e392051 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -1599,7 +1599,7 @@ function PMA_DBI_fetchValue($result, $row_number = 0, $field = 0, $link = null) // return false if result is empty or false // or requested row is larger than rows in result - if (PMA_DBI_num_rows($result) < ($row_number + 1)) { + if (PMA_DBI_numRows($result) < ($row_number + 1)) { return $value; } @@ -1651,7 +1651,7 @@ function PMA_DBI_fetchSingleRow($result, $type = 'ASSOC', $link = null) } // return null if result is empty or false - if (! PMA_DBI_num_rows($result)) { + if (! PMA_DBI_numRows($result)) { return false; } diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php index 7419856545..2deeabaf10 100644 --- a/libraries/db_info.inc.php +++ b/libraries/db_info.inc.php @@ -71,7 +71,7 @@ if (true === $cfg['SkipLockedTables']) { ); // Blending out tables in use - if ($db_info_result && PMA_DBI_num_rows($db_info_result) > 0) { + if ($db_info_result && PMA_DBI_numRows($db_info_result) > 0) { while ($tmp = PMA_DBI_fetchRow($db_info_result)) { // if in use memorize tablename if (preg_match('@in_use=[1-9]+@i', $tmp[1])) { @@ -85,7 +85,7 @@ if (true === $cfg['SkipLockedTables']) { 'SHOW TABLES FROM ' . PMA_Util::backquote($db) . $tbl_group_sql . ';', null, PMA_DBI_QUERY_STORE ); - if ($db_info_result && PMA_DBI_num_rows($db_info_result) > 0) { + if ($db_info_result && PMA_DBI_numRows($db_info_result) > 0) { while ($tmp = PMA_DBI_fetchRow($db_info_result)) { if (! isset($sot_cache[$tmp[0]])) { $sts_result = PMA_DBI_query( diff --git a/libraries/db_table_exists.lib.php b/libraries/db_table_exists.lib.php index add6e586d9..143f6f86d9 100644 --- a/libraries/db_table_exists.lib.php +++ b/libraries/db_table_exists.lib.php @@ -63,7 +63,7 @@ if (empty($is_table) . '\';', null, PMA_DBI_QUERY_STORE ); - $is_table = @PMA_DBI_num_rows($_result); + $is_table = @PMA_DBI_numRows($_result); PMA_DBI_freeResult($_result); } } else { @@ -86,7 +86,7 @@ if (empty($is_table) null, PMA_DBI_QUERY_STORE ); - $is_table = ($_result && @PMA_DBI_num_rows($_result)); + $is_table = ($_result && @PMA_DBI_numRows($_result)); PMA_DBI_freeResult($_result); } diff --git a/libraries/dbi/drizzle.dbi.lib.php b/libraries/dbi/drizzle.dbi.lib.php index 97c519aba9..0fc8874387 100644 --- a/libraries/dbi/drizzle.dbi.lib.php +++ b/libraries/dbi/drizzle.dbi.lib.php @@ -387,7 +387,7 @@ function PMA_DBI_getError($link = null) * * @return string|int */ -function PMA_DBI_num_rows($result) +function PMA_DBI_numRows($result) { // see the note for PMA_DBI_tryQuery(); if (!is_bool($result)) { diff --git a/libraries/dbi/dummy.lib.php b/libraries/dbi/dummy.lib.php index c1a99a8b7e..e68520d038 100644 --- a/libraries/dbi/dummy.lib.php +++ b/libraries/dbi/dummy.lib.php @@ -460,7 +460,7 @@ function PMA_DBI_nextResult() * * @return string|int */ -function PMA_DBI_num_rows($result) +function PMA_DBI_numRows($result) { if (!is_bool($result)) { return count($GLOBALS['dummy_queries'][$result]['result']); diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index 66de7e5c04..33c09bfdb7 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -408,7 +408,7 @@ function PMA_DBI_getError($link = null) * * @return string|int */ -function PMA_DBI_num_rows($result) +function PMA_DBI_numRows($result) { if (!is_bool($result)) { return mysql_num_rows($result); diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 731ff7ab8a..0fc6c5e4fb 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -492,7 +492,7 @@ function PMA_DBI_getError($link = null) * * @return string|int */ -function PMA_DBI_num_rows($result) +function PMA_DBI_numRows($result) { // see the note for PMA_DBI_tryQuery(); if (!is_bool($result)) { diff --git a/libraries/import.lib.php b/libraries/import.lib.php index e825451da9..2fe7106672 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -175,7 +175,7 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false, return; } } else { - $a_num_rows = (int)@PMA_DBI_num_rows($result); + $a_num_rows = (int)@PMA_DBI_numRows($result); $a_aff_rows = (int)@PMA_DBI_affected_rows(); if ($a_num_rows > 0) { $msg .= __('Rows'). ': ' . $a_num_rows; diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index 06dd1e07bc..645061613d 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -1994,7 +1994,7 @@ function PMA_getDisplayValueForForeignTableColumn($where_comparison, . ' WHERE ' . PMA_Util::backquote($map[$relation_field]['foreign_field']) . $where_comparison; $dispresult = PMA_DBI_tryQuery($dispsql, null, PMA_DBI_QUERY_STORE); - if ($dispresult && PMA_DBI_num_rows($dispresult) > 0) { + if ($dispresult && PMA_DBI_numRows($dispresult) > 0) { list($dispval) = PMA_DBI_fetchRow($dispresult, 0); } @PMA_DBI_freeResult($dispresult); diff --git a/libraries/navigation/Nodes/Node.class.php b/libraries/navigation/Nodes/Node.class.php index d27e52fc36..0a8703ba41 100644 --- a/libraries/navigation/Nodes/Node.class.php +++ b/libraries/navigation/Nodes/Node.class.php @@ -405,7 +405,7 @@ class Node ); $query .= "%' "; } - $retval = PMA_DBI_num_rows(PMA_DBI_tryQuery($query)); + $retval = PMA_DBI_numRows(PMA_DBI_tryQuery($query)); } return $retval; } diff --git a/libraries/navigation/Nodes/Node_Database.class.php b/libraries/navigation/Nodes/Node_Database.class.php index ac1d33a7f1..66212b8024 100644 --- a/libraries/navigation/Nodes/Node_Database.class.php +++ b/libraries/navigation/Nodes/Node_Database.class.php @@ -81,7 +81,7 @@ class Node_Database extends Node ); $query .= "%'"; } - $retval = PMA_DBI_num_rows(PMA_DBI_tryQuery($query)); + $retval = PMA_DBI_numRows(PMA_DBI_tryQuery($query)); } break; case 'views': @@ -112,7 +112,7 @@ class Node_Database extends Node ); $query .= "%'"; } - $retval = PMA_DBI_num_rows(PMA_DBI_tryQuery($query)); + $retval = PMA_DBI_numRows(PMA_DBI_tryQuery($query)); } break; case 'procedures': @@ -140,7 +140,7 @@ class Node_Database extends Node ); $query .= "%'"; } - $retval = PMA_DBI_num_rows(PMA_DBI_tryQuery($query)); + $retval = PMA_DBI_numRows(PMA_DBI_tryQuery($query)); } break; case 'functions': @@ -168,7 +168,7 @@ class Node_Database extends Node ); $query .= "%'"; } - $retval = PMA_DBI_num_rows(PMA_DBI_tryQuery($query)); + $retval = PMA_DBI_numRows(PMA_DBI_tryQuery($query)); } break; case 'events': @@ -195,7 +195,7 @@ class Node_Database extends Node ); $query .= "%'"; } - $retval = PMA_DBI_num_rows(PMA_DBI_tryQuery($query)); + $retval = PMA_DBI_numRows(PMA_DBI_tryQuery($query)); } break; default: diff --git a/libraries/navigation/Nodes/Node_Table.class.php b/libraries/navigation/Nodes/Node_Table.class.php index d24cd436b5..44d9c05371 100644 --- a/libraries/navigation/Nodes/Node_Table.class.php +++ b/libraries/navigation/Nodes/Node_Table.class.php @@ -69,14 +69,14 @@ class Node_Table extends Node $db = PMA_Util::backquote($db); $table = PMA_Util::backquote($table); $query = "SHOW COLUMNS FROM $table FROM $db"; - $retval = (int)PMA_DBI_num_rows(PMA_DBI_tryQuery($query)); + $retval = (int)PMA_DBI_numRows(PMA_DBI_tryQuery($query)); } break; case 'indexes': $db = PMA_Util::backquote($db); $table = PMA_Util::backquote($table); $query = "SHOW INDEXES FROM $table FROM $db"; - $retval = (int)PMA_DBI_num_rows(PMA_DBI_tryQuery($query)); + $retval = (int)PMA_DBI_numRows(PMA_DBI_tryQuery($query)); break; case 'triggers': if (! $GLOBALS['cfg']['Servers'][$GLOBALS['server']]['DisableIS']) { @@ -91,7 +91,7 @@ class Node_Table extends Node $db = PMA_Util::backquote($db); $table = PMA_Util::sqlAddSlashes($table); $query = "SHOW TRIGGERS FROM $db WHERE `Table` = '$table'"; - $retval = (int)PMA_DBI_num_rows(PMA_DBI_tryQuery($query)); + $retval = (int)PMA_DBI_numRows(PMA_DBI_tryQuery($query)); } break; default: diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php index f64fc3dc83..0cd5a64d9b 100644 --- a/libraries/plugins/export/ExportSql.class.php +++ b/libraries/plugins/export/ExportSql.class.php @@ -903,7 +903,7 @@ class ExportSql extends ExportPlugin $compat = 'NONE'; } - // need to use PMA_DBI_QUERY_STORE with PMA_DBI_num_rows() in mysqli + // need to use PMA_DBI_QUERY_STORE with PMA_DBI_numRows() in mysqli $result = PMA_DBI_query( 'SHOW TABLE STATUS FROM ' . PMA_Util::backquote($db) . ' LIKE \'' . PMA_Util::sqlAddSlashes($table, true) . '\'', @@ -911,7 +911,7 @@ class ExportSql extends ExportPlugin PMA_DBI_QUERY_STORE ); if ($result != false) { - if (PMA_DBI_num_rows($result) > 0) { + if (PMA_DBI_numRows($result) > 0) { $tmpres = PMA_DBI_fetchAssoc($result); if (PMA_DRIZZLE && $show_dates) { // Drizzle doesn't give Create_time and Update_time in diff --git a/libraries/plugins/import/ImportLdi.class.php b/libraries/plugins/import/ImportLdi.class.php index 84ff8b00f1..9754e94633 100644 --- a/libraries/plugins/import/ImportLdi.class.php +++ b/libraries/plugins/import/ImportLdi.class.php @@ -47,7 +47,7 @@ class ImportLdi extends AbstractImportCsv $GLOBALS['cfg']['Import']['ldi_local_option'] = false; $result = PMA_DBI_tryQuery('SHOW VARIABLES LIKE \'local\\_infile\';'); - if ($result != false && PMA_DBI_num_rows($result) > 0) { + if ($result != false && PMA_DBI_numRows($result) > 0) { $tmp = PMA_DBI_fetchRow($result); if ($tmp[1] == 'ON') { $GLOBALS['cfg']['Import']['ldi_local_option'] = true; diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 92ec7698a8..967fe875ba 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -704,7 +704,7 @@ function PMA_getDbComment($db) AND column_name = '(db_comment)'"; $com_rs = PMA_queryAsControlUser($com_qry, true, PMA_DBI_QUERY_STORE); - if ($com_rs && PMA_DBI_num_rows($com_rs) > 0) { + if ($com_rs && PMA_DBI_numRows($com_rs) > 0) { $row = PMA_DBI_fetchAssoc($com_rs); $comment = $row['comment']; } @@ -735,7 +735,7 @@ function PMA_getDbComments() WHERE `column_name` = '(db_comment)'"; $com_rs = PMA_queryAsControlUser($com_qry, true, PMA_DBI_QUERY_STORE); - if ($com_rs && PMA_DBI_num_rows($com_rs) > 0) { + if ($com_rs && PMA_DBI_numRows($com_rs) > 0) { while ($row = PMA_DBI_fetchAssoc($com_rs)) { $comments[$row['db_name']] = $row['comment']; } @@ -1135,7 +1135,7 @@ function PMA_getForeignData($foreigners, $field, $override_total, $foreign_filte } $disp = PMA_DBI_query($f_query_main . $f_query_from . $f_query_filter . $f_query_order . $f_query_limit); - if ($disp && PMA_DBI_num_rows($disp) > 0) { + if ($disp && PMA_DBI_numRows($disp) > 0) { // If a resultset has been created, pre-cache it in the $disp_row array // This helps us from not needing to use mysql_data_seek by accessing a pre-cached // PHP array. Usually those resultsets are not that big, so a performance hit should diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index fa9f112be6..6e3e2e230d 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -1374,7 +1374,7 @@ function PMA_RTN_handleExecute() do { $result = PMA_DBI_store_result(); - $num_rows = PMA_DBI_num_rows($result); + $num_rows = PMA_DBI_numRows($result); if (($result !== false) && ($num_rows > 0)) { diff --git a/libraries/schema/Dia_Relation_Schema.class.php b/libraries/schema/Dia_Relation_Schema.class.php index 90160dc762..ed8bc37389 100644 --- a/libraries/schema/Dia_Relation_Schema.class.php +++ b/libraries/schema/Dia_Relation_Schema.class.php @@ -230,7 +230,7 @@ class Table_Stats $this->tableName = $tableName; $sql = 'DESCRIBE ' . PMA_Util::backquote($tableName); $result = PMA_DBI_tryQuery($sql, null, PMA_DBI_QUERY_STORE); - if (! $result || ! PMA_DBI_num_rows($result)) { + if (! $result || ! PMA_DBI_numRows($result)) { $dia->dieSchema( $pageNumber, "DIA", sprintf(__('The %s table doesn\'t exist!'), $tableName) @@ -264,7 +264,7 @@ class Table_Stats . PMA_Util::sqlAddSlashes($tableName) . '\'' . ' AND pdf_page_number = ' . $pageNumber; $result = PMA_queryAsControlUser($sql, false, PMA_DBI_QUERY_STORE); - if (! $result || ! PMA_DBI_num_rows($result)) { + if (! $result || ! PMA_DBI_numRows($result)) { $dia->dieSchema( $pageNumber, "DIA", @@ -289,7 +289,7 @@ class Table_Stats null, PMA_DBI_QUERY_STORE ); - if (PMA_DBI_num_rows($result) > 0) { + if (PMA_DBI_numRows($result) > 0) { while ($row = PMA_DBI_fetchAssoc($result)) { if ($row['Key_name'] == 'PRIMARY') { $this->primary[] = $row['Column_name']; diff --git a/libraries/schema/Eps_Relation_Schema.class.php b/libraries/schema/Eps_Relation_Schema.class.php index d2cf3ad3e1..9034739437 100644 --- a/libraries/schema/Eps_Relation_Schema.class.php +++ b/libraries/schema/Eps_Relation_Schema.class.php @@ -419,7 +419,7 @@ class Table_Stats $this->_tableName = $tableName; $sql = 'DESCRIBE ' . PMA_Util::backquote($tableName); $result = PMA_DBI_tryQuery($sql, null, PMA_DBI_QUERY_STORE); - if (! $result || ! PMA_DBI_num_rows($result)) { + if (! $result || ! PMA_DBI_numRows($result)) { $eps->dieSchema( $pageNumber, "EPS", sprintf(__('The %s table doesn\'t exist!'), $tableName) @@ -467,7 +467,7 @@ class Table_Stats . ' AND pdf_page_number = ' . $pageNumber; $result = PMA_queryAsControlUser($sql, false, PMA_DBI_QUERY_STORE); - if (! $result || ! PMA_DBI_num_rows($result)) { + if (! $result || ! PMA_DBI_numRows($result)) { $eps->dieSchema( $pageNumber, "EPS", sprintf( @@ -486,7 +486,7 @@ class Table_Stats 'SHOW INDEX FROM ' . PMA_Util::backquote($tableName) . ';', null, PMA_DBI_QUERY_STORE ); - if (PMA_DBI_num_rows($result) > 0) { + if (PMA_DBI_numRows($result) > 0) { while ($row = PMA_DBI_fetchAssoc($result)) { if ($row['Key_name'] == 'PRIMARY') { $this->primary[] = $row['Column_name']; diff --git a/libraries/schema/Export_Relation_Schema.class.php b/libraries/schema/Export_Relation_Schema.class.php index e4601cfc51..c075a92555 100644 --- a/libraries/schema/Export_Relation_Schema.class.php +++ b/libraries/schema/Export_Relation_Schema.class.php @@ -200,7 +200,7 @@ class PMA_Export_Relation_Schema . ' AND pdf_page_number = ' . $pageNumber; $tab_rs = PMA_queryAsControlUser($tab_sql, null, PMA_DBI_QUERY_STORE); - if (! $tab_rs || ! PMA_DBI_num_rows($tab_rs) > 0) { + if (! $tab_rs || ! PMA_DBI_numRows($tab_rs) > 0) { $this->dieSchema('', __('This page does not contain any tables!')); } while ($curr_table = @PMA_DBI_fetchAssoc($tab_rs)) { diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php index a601ad1bfb..52bdafd7d9 100644 --- a/libraries/schema/Pdf_Relation_Schema.class.php +++ b/libraries/schema/Pdf_Relation_Schema.class.php @@ -406,7 +406,7 @@ class Table_Stats $this->_tableName = $tableName; $sql = 'DESCRIBE ' . PMA_Util::backquote($tableName); $result = PMA_DBI_tryQuery($sql, null, PMA_DBI_QUERY_STORE); - if (! $result || ! PMA_DBI_num_rows($result)) { + if (! $result || ! PMA_DBI_numRows($result)) { $pdf->Error(sprintf(__('The %s table doesn\'t exist!'), $tableName)); } // load fields @@ -444,7 +444,7 @@ class Table_Stats . ' AND table_name = \'' . PMA_Util::sqlAddSlashes($tableName) . '\'' . ' AND pdf_page_number = ' . $pageNumber; $result = PMA_queryAsControlUser($sql, false, PMA_DBI_QUERY_STORE); - if (! $result || ! PMA_DBI_num_rows($result)) { + if (! $result || ! PMA_DBI_numRows($result)) { $pdf->Error( sprintf( __('Please configure the coordinates for table %s'), @@ -466,7 +466,7 @@ class Table_Stats 'SHOW INDEX FROM ' . PMA_Util::backquote($tableName) . ';', null, PMA_DBI_QUERY_STORE ); - if (PMA_DBI_num_rows($result) > 0) { + if (PMA_DBI_numRows($result) > 0) { while ($row = PMA_DBI_fetchAssoc($result)) { if ($row['Key_name'] == 'PRIMARY') { $this->primary[] = $row['Column_name']; diff --git a/libraries/schema/Svg_Relation_Schema.class.php b/libraries/schema/Svg_Relation_Schema.class.php index ecd2562deb..d19f06f22a 100644 --- a/libraries/schema/Svg_Relation_Schema.class.php +++ b/libraries/schema/Svg_Relation_Schema.class.php @@ -385,7 +385,7 @@ class Table_Stats $this->_tableName = $tableName; $sql = 'DESCRIBE ' . PMA_Util::backquote($tableName); $result = PMA_DBI_tryQuery($sql, null, PMA_DBI_QUERY_STORE); - if (! $result || ! PMA_DBI_num_rows($result)) { + if (! $result || ! PMA_DBI_numRows($result)) { $svg->dieSchema( $pageNumber, "SVG", @@ -435,7 +435,7 @@ class Table_Stats . ' AND pdf_page_number = ' . $pageNumber; $result = PMA_queryAsControlUser($sql, false, PMA_DBI_QUERY_STORE); - if (! $result || ! PMA_DBI_num_rows($result)) { + if (! $result || ! PMA_DBI_numRows($result)) { $svg->dieSchema( $pageNumber, "SVG", @@ -456,7 +456,7 @@ class Table_Stats null, PMA_DBI_QUERY_STORE ); - if (PMA_DBI_num_rows($result) > 0) { + if (PMA_DBI_numRows($result) > 0) { while ($row = PMA_DBI_fetchAssoc($result)) { if ($row['Key_name'] == 'PRIMARY') { $this->primary[] = $row['Column_name']; diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index 2a638387d7..2ae422db5c 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -185,7 +185,7 @@ class PMA_User_Schema $page_query, false, PMA_DBI_QUERY_STORE ); - if ($page_rs && PMA_DBI_num_rows($page_rs) > 0) { + if ($page_rs && PMA_DBI_numRows($page_rs) > 0) { ?>
@@ -747,7 +747,7 @@ class PMA_User_Schema $master_tables_rs = PMA_queryAsControlUser( $master_tables, false, PMA_DBI_QUERY_STORE ); - if ($master_tables_rs && PMA_DBI_num_rows($master_tables_rs) > 0) { + if ($master_tables_rs && PMA_DBI_numRows($master_tables_rs) > 0) { /* first put all the master tables at beginning * of the list, so they are near the center of * the schema @@ -889,7 +889,7 @@ class PMA_User_Schema $test_query, false, PMA_DBI_QUERY_STORE ); //echo $test_query; - if ($test_rs && PMA_DBI_num_rows($test_rs) > 0) { + if ($test_rs && PMA_DBI_numRows($test_rs) > 0) { if (isset($arrvalue['delete']) && $arrvalue['delete'] == 'y') { $ch_query = 'DELETE FROM ' . PMA_Util::backquote($GLOBALS['cfgRelation']['db']) diff --git a/libraries/schema/Visio_Relation_Schema.class.php b/libraries/schema/Visio_Relation_Schema.class.php index 0e19bfd9b3..18bb2dc554 100644 --- a/libraries/schema/Visio_Relation_Schema.class.php +++ b/libraries/schema/Visio_Relation_Schema.class.php @@ -225,7 +225,7 @@ class Table_Stats $this->_tableName = $tableName; $sql = 'DESCRIBE ' . PMA_Util::backquote($tableName); $result = PMA_DBI_tryQuery($sql, null, PMA_DBI_QUERY_STORE); - if (! $result || ! PMA_DBI_num_rows($result)) { + if (! $result || ! PMA_DBI_numRows($result)) { $visio->dieSchema( $pageNumber, "VISIO", @@ -275,7 +275,7 @@ class Table_Stats . ' AND pdf_page_number = ' . $pageNumber; $result = PMA_queryAsControlUser($sql, false, PMA_DBI_QUERY_STORE); - if (! $result || ! PMA_DBI_num_rows($result)) { + if (! $result || ! PMA_DBI_numRows($result)) { $visio->dieSchema( $pageNumber, "VISIO", @@ -295,7 +295,7 @@ class Table_Stats 'SHOW INDEX FROM ' . PMA_Util::backquote($tableName) . ';', null, PMA_DBI_QUERY_STORE ); - if (PMA_DBI_num_rows($result) > 0) { + if (PMA_DBI_numRows($result) > 0) { while ($row = PMA_DBI_fetchAssoc($result)) { if ($row['Key_name'] == 'PRIMARY') { $this->primary[] = $row['Column_name']; diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index 5addee637e..f01e3d18a0 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -2958,7 +2958,7 @@ function PMA_getHtmlForDisplayUserOverviewPage($link_edit, $pmaThemeImage, * Displays the initials * Also not necassary if there is less than 20 privileges */ - if (PMA_DBI_num_rows($res) > 20 ) { + if (PMA_DBI_numRows($res) > 20 ) { $html_output .= PMA_getHtmlForDisplayTheInitials( $array_initials, $conditional_class ); @@ -2970,7 +2970,7 @@ function PMA_getHtmlForDisplayUserOverviewPage($link_edit, $pmaThemeImage, */ if (isset($_REQUEST['initial']) || isset($_REQUEST['showall']) - || PMA_DBI_num_rows($res) < 50 + || PMA_DBI_numRows($res) < 50 ) { $html_output .= PMA_getUsersOverview( $res, $db_rights, $link_edit, $pmaThemeImage, diff --git a/libraries/transformations.lib.php b/libraries/transformations.lib.php index 9c7c7f1ba6..96e47036c2 100644 --- a/libraries/transformations.lib.php +++ b/libraries/transformations.lib.php @@ -282,7 +282,7 @@ function PMA_setMIME($db, $table, $key, $mimetype, $transformation, $test_rs = PMA_queryAsControlUser($test_qry, true, PMA_DBI_QUERY_STORE); - if ($test_rs && PMA_DBI_num_rows($test_rs) > 0) { + if ($test_rs && PMA_DBI_numRows($test_rs) > 0) { $row = @PMA_DBI_fetchAssoc($test_rs); PMA_DBI_freeResult($test_rs); diff --git a/pmd_pdf.php b/pmd_pdf.php index e8c7105167..bdfcc00810 100644 --- a/pmd_pdf.php +++ b/pmd_pdf.php @@ -109,7 +109,7 @@ $table_info_result = PMA_queryAsControlUser( . ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($db) . '\'' ); -if (PMA_DBI_num_rows($table_info_result) > 0) { +if (PMA_DBI_numRows($table_info_result) > 0) { echo '

' . __('Page:'); echo ''; while ($entries = PMA_DBI_fetchArray($sql_result)) { From c09aa36d8492714fefcfefa83ecac437ecdb8cdb Mon Sep 17 00:00:00 2001 From: Kasun Chathuranga Date: Sat, 4 May 2013 08:41:02 +0530 Subject: [PATCH 17/36] PMA_DBI_insert_id --> PMA_DBI_insertId --- libraries/Table.class.php | 2 +- libraries/dbi/drizzle.dbi.lib.php | 4 ++-- libraries/dbi/mysql.dbi.lib.php | 2 +- libraries/dbi/mysqli.dbi.lib.php | 4 ++-- libraries/insert_edit.lib.php | 2 +- libraries/relation.lib.php | 2 +- sql.php | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 190f3f4d7c..9eed857556 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -677,7 +677,7 @@ class PMA_Table \'' . implode('\', \'', $new_value_parts) . '\')'; PMA_queryAsControlUser($new_table_query); - $last_id = PMA_DBI_insert_id(); + $last_id = PMA_DBI_insertId(); } // end while PMA_DBI_freeResult($table_copy_rs); diff --git a/libraries/dbi/drizzle.dbi.lib.php b/libraries/dbi/drizzle.dbi.lib.php index 0fc8874387..21f9d0495d 100644 --- a/libraries/dbi/drizzle.dbi.lib.php +++ b/libraries/dbi/drizzle.dbi.lib.php @@ -404,7 +404,7 @@ function PMA_DBI_numRows($result) * * @return string|int */ -function PMA_DBI_insert_id($link = null) +function PMA_DBI_insertId($link = null) { if (empty($link)) { if (isset($GLOBALS['userlink'])) { @@ -421,7 +421,7 @@ function PMA_DBI_insert_id($link = null) // the tracking mechanism, but this works: return PMA_DBI_fetchValue('SELECT LAST_INSERT_ID();', 0, 0, $link); // Curiously, this problem does not happen with the mysql extension but - // there is another problem with BIGINT primary keys so PMA_DBI_insert_id() + // there is another problem with BIGINT primary keys so PMA_DBI_insertId() // in the mysql extension also uses this logic. } diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index 33c09bfdb7..e3ecb294df 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -424,7 +424,7 @@ function PMA_DBI_numRows($result) * * @return string|int */ -function PMA_DBI_insert_id($link = null) +function PMA_DBI_insertId($link = null) { if (empty($link)) { if (isset($GLOBALS['userlink'])) { diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 0fc6c5e4fb..c0b98912d2 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -509,7 +509,7 @@ function PMA_DBI_numRows($result) * * @return string|int */ -function PMA_DBI_insert_id($link = null) +function PMA_DBI_insertId($link = null) { if (empty($link)) { if (isset($GLOBALS['userlink'])) { @@ -523,7 +523,7 @@ function PMA_DBI_insert_id($link = null) // the tracking mechanism, but this works: return PMA_DBI_fetchValue('SELECT LAST_INSERT_ID();', 0, 0, $link); // Curiously, this problem does not happen with the mysql extension but - // there is another problem with BIGINT primary keys so PMA_DBI_insert_id() + // there is another problem with BIGINT primary keys so PMA_DBI_insertId() // in the mysql extension also uses this logic. } diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index 645061613d..e196b03fb9 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -1926,7 +1926,7 @@ function PMA_executeSqlQuery($url_params, $query) } unset($tmp); - $insert_id = PMA_DBI_insert_id(); + $insert_id = PMA_DBI_insertId(); if ($insert_id != 0) { // insert_id is id of FIRST record inserted in one insert, so if we // inserted multiple rows, we had to increment this diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 967fe875ba..1bb6cbe41a 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -1408,7 +1408,7 @@ function PMA_REL_createPage($newpage, $cfgRelation, $db) . PMA_Util::sqlAddSlashes($newpage) . '\')'; PMA_queryAsControlUser($ins_query, false); - return PMA_DBI_insert_id( + return PMA_DBI_insertId( isset($GLOBALS['controllink']) ? $GLOBALS['controllink'] : '' ); } diff --git a/sql.php b/sql.php index b0e56ef45d..6edf3e0359 100644 --- a/sql.php +++ b/sql.php @@ -905,7 +905,7 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) { } else { $message = PMA_Message::getMessageForInsertedRows($num_rows); } - $insert_id = PMA_DBI_insert_id(); + $insert_id = PMA_DBI_insertId(); if ($insert_id != 0) { // insert_id is id of FIRST record inserted in one insert, // so if we inserted multiple rows, we had to increment this From 63e0f33c4af39d2a6a8956cf566c0e496ec26fa7 Mon Sep 17 00:00:00 2001 From: Kasun Chathuranga Date: Sat, 4 May 2013 08:41:55 +0530 Subject: [PATCH 18/36] PMA_DBI_affected_rows --> PMA_DBI_affectedRows --- libraries/database_interface.lib.php | 2 +- libraries/dbi/drizzle.dbi.lib.php | 2 +- libraries/dbi/dummy.lib.php | 2 +- libraries/dbi/mysql.dbi.lib.php | 2 +- libraries/dbi/mysqli.dbi.lib.php | 2 +- libraries/import.lib.php | 2 +- libraries/insert_edit.lib.php | 2 +- sql.php | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index c32e392051..b14bc6da92 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -192,7 +192,7 @@ function PMA_DBI_tryQuery($query, $link = null, $options = 0, $result = PMA_DBI_realQuery($query, $link, $options); if ($cache_affected_rows) { - $GLOBALS['cached_affected_rows'] = PMA_DBI_affected_rows($link, false); + $GLOBALS['cached_affected_rows'] = PMA_DBI_affectedRows($link, false); } if ($GLOBALS['cfg']['DBG']['sql']) { diff --git a/libraries/dbi/drizzle.dbi.lib.php b/libraries/dbi/drizzle.dbi.lib.php index 21f9d0495d..28644fc30e 100644 --- a/libraries/dbi/drizzle.dbi.lib.php +++ b/libraries/dbi/drizzle.dbi.lib.php @@ -433,7 +433,7 @@ function PMA_DBI_insertId($link = null) * * @return string|int */ -function PMA_DBI_affected_rows($link = null, $get_from_cache = true) +function PMA_DBI_affectedRows($link = null, $get_from_cache = true) { if (empty($link)) { if (isset($GLOBALS['userlink'])) { diff --git a/libraries/dbi/dummy.lib.php b/libraries/dbi/dummy.lib.php index e68520d038..c4018746e0 100644 --- a/libraries/dbi/dummy.lib.php +++ b/libraries/dbi/dummy.lib.php @@ -477,7 +477,7 @@ function PMA_DBI_numRows($result) * * @return string|int */ -function PMA_DBI_affected_rows($link = null, $get_from_cache = true) +function PMA_DBI_affectedRows($link = null, $get_from_cache = true) { return 0; } diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index e3ecb294df..c6b2f48e01 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -449,7 +449,7 @@ function PMA_DBI_insertId($link = null) * * @return string|int */ -function PMA_DBI_affected_rows($link = null, $get_from_cache = true) +function PMA_DBI_affectedRows($link = null, $get_from_cache = true) { if (empty($link)) { if (isset($GLOBALS['userlink'])) { diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index c0b98912d2..05e8a293a7 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -535,7 +535,7 @@ function PMA_DBI_insertId($link = null) * * @return string|int */ -function PMA_DBI_affected_rows($link = null, $get_from_cache = true) +function PMA_DBI_affectedRows($link = null, $get_from_cache = true) { if (empty($link)) { if (isset($GLOBALS['userlink'])) { diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 2fe7106672..549d27b195 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -176,7 +176,7 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false, } } else { $a_num_rows = (int)@PMA_DBI_numRows($result); - $a_aff_rows = (int)@PMA_DBI_affected_rows(); + $a_aff_rows = (int)@PMA_DBI_affectedRows(); if ($a_num_rows > 0) { $msg .= __('Rows'). ': ' . $a_num_rows; $last_query_with_results = $import_run_buffer['sql']; diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index e196b03fb9..df133c98f6 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -1921,7 +1921,7 @@ function PMA_executeSqlQuery($url_params, $query) $error_messages[] = PMA_Message::sanitize(PMA_DBI_getError()); } else { // The next line contains a real assignment, it's not a typo - if ($tmp = @PMA_DBI_affected_rows()) { + if ($tmp = @PMA_DBI_affectedRows()) { $total_affected_rows += $tmp; } unset($tmp); diff --git a/sql.php b/sql.php index 6edf3e0359..edc2693059 100644 --- a/sql.php +++ b/sql.php @@ -720,7 +720,7 @@ if (isset($GLOBALS['show_as_php']) || ! empty($GLOBALS['validatequery'])) { if (! $is_affected) { $num_rows = ($result) ? @PMA_DBI_numRows($result) : 0; } elseif (! isset($num_rows)) { - $num_rows = @PMA_DBI_affected_rows(); + $num_rows = @PMA_DBI_affectedRows(); } // Grabs the profiling results @@ -1578,7 +1578,7 @@ function getTableHtmlForMultipleQueries( if (! $is_affected) { $num_rows = ($result) ? @PMA_DBI_numRows($result) : 0; } elseif (! isset($num_rows)) { - $num_rows = @PMA_DBI_affected_rows(); + $num_rows = @PMA_DBI_affectedRows(); } if (isset($sql_data['valid_sql'][$sql_no])) { From 2f0d55b708a02d52df9cd4f109be26d9539c07d8 Mon Sep 17 00:00:00 2001 From: Kasun Chathuranga Date: Sat, 4 May 2013 08:43:23 +0530 Subject: [PATCH 19/36] PMA_DBI_get_fields_meta --> PMA_DBI_getFieldsMeta --- libraries/dbi/drizzle.dbi.lib.php | 2 +- libraries/dbi/mysql.dbi.lib.php | 2 +- libraries/dbi/mysqli.dbi.lib.php | 2 +- libraries/insert_edit.lib.php | 4 ++-- libraries/plugins/export/ExportJson.class.php | 2 +- libraries/plugins/export/ExportOds.class.php | 2 +- libraries/plugins/export/ExportOdt.class.php | 2 +- libraries/plugins/export/ExportSql.class.php | 2 +- libraries/plugins/export/PMA_ExportPdf.class.php | 2 +- libraries/rte/rte_routines.lib.php | 2 +- libraries/tbl_columns_definition_form.inc.php | 2 +- libraries/tbl_views.lib.php | 2 +- sql.php | 6 +++--- tbl_chart.php | 2 +- tbl_gis_visualization.php | 2 +- tbl_zoom_select.php | 4 ++-- 16 files changed, 20 insertions(+), 20 deletions(-) diff --git a/libraries/dbi/drizzle.dbi.lib.php b/libraries/dbi/drizzle.dbi.lib.php index 28644fc30e..5e617eaa2c 100644 --- a/libraries/dbi/drizzle.dbi.lib.php +++ b/libraries/dbi/drizzle.dbi.lib.php @@ -456,7 +456,7 @@ function PMA_DBI_affectedRows($link = null, $get_from_cache = true) * * @return array meta info for fields in $result */ -function PMA_DBI_get_fields_meta($result) +function PMA_DBI_getFieldsMeta($result) { // Build an associative array for a type look up $typeAr = array(); diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index c6b2f48e01..56b5f7a0b7 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -475,7 +475,7 @@ function PMA_DBI_affectedRows($link = null, $get_from_cache = true) * * @todo add missing keys like in mysqli_query (decimals) */ -function PMA_DBI_get_fields_meta($result) +function PMA_DBI_getFieldsMeta($result) { $fields = array(); $num_fields = mysql_num_fields($result); diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 05e8a293a7..ea0ea60d09 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -558,7 +558,7 @@ function PMA_DBI_affectedRows($link = null, $get_from_cache = true) * * @return array meta info for fields in $result */ -function PMA_DBI_get_fields_meta($result) +function PMA_DBI_getFieldsMeta($result) { // Build an associative array for a type look up $typeAr = array(); diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index df133c98f6..fb6adf14d7 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -126,7 +126,7 @@ function PMA_showEmptyResultMessageOrSetUniqueCondition($rows, $key_id, * exit if we want the message to be displayed */ } else {// end if (no row returned) - $meta = PMA_DBI_get_fields_meta($result[$key_id]); + $meta = PMA_DBI_getFieldsMeta($result[$key_id]); list($unique_condition, $tmp_clause_is_unique) = PMA_Util::getUniqueCondition( @@ -1788,7 +1788,7 @@ function PMA_setSessionForEditNext($one_where_clause) $res = PMA_DBI_query($local_query); $row = PMA_DBI_fetchRow($res); - $meta = PMA_DBI_get_fields_meta($res); + $meta = PMA_DBI_getFieldsMeta($res); // must find a unique condition based on unique key, // not a combination of all fields list($unique_condition, $clause_is_unique) diff --git a/libraries/plugins/export/ExportJson.class.php b/libraries/plugins/export/ExportJson.class.php index b52181dcf2..3405688dbf 100644 --- a/libraries/plugins/export/ExportJson.class.php +++ b/libraries/plugins/export/ExportJson.class.php @@ -162,7 +162,7 @@ class ExportJson extends ExportPlugin $columns_cnt = PMA_DBI_num_fields($result); // Get field information - $fields_meta = PMA_DBI_get_fields_meta($result); + $fields_meta = PMA_DBI_getFieldsMeta($result); for ($i = 0; $i < $columns_cnt; $i++) { $columns[$i] = stripslashes(PMA_DBI_field_name($result, $i)); diff --git a/libraries/plugins/export/ExportOds.class.php b/libraries/plugins/export/ExportOds.class.php index 88371da92b..2752410963 100644 --- a/libraries/plugins/export/ExportOds.class.php +++ b/libraries/plugins/export/ExportOds.class.php @@ -228,7 +228,7 @@ class ExportOds extends ExportPlugin // Gets the data from the database $result = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED); $fields_cnt = PMA_DBI_num_fields($result); - $fields_meta = PMA_DBI_get_fields_meta($result); + $fields_meta = PMA_DBI_getFieldsMeta($result); $field_flags = array(); for ($j = 0; $j < $fields_cnt; $j++) { $field_flags[$j] = PMA_DBI_field_flags($result, $j); diff --git a/libraries/plugins/export/ExportOdt.class.php b/libraries/plugins/export/ExportOdt.class.php index 2f243aab81..91aa32fd4e 100644 --- a/libraries/plugins/export/ExportOdt.class.php +++ b/libraries/plugins/export/ExportOdt.class.php @@ -246,7 +246,7 @@ class ExportOdt extends ExportPlugin // Gets the data from the database $result = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED); $fields_cnt = PMA_DBI_num_fields($result); - $fields_meta = PMA_DBI_get_fields_meta($result); + $fields_meta = PMA_DBI_getFieldsMeta($result); $field_flags = array(); for ($j = 0; $j < $fields_cnt; $j++) { $field_flags[$j] = PMA_DBI_field_flags($result, $j); diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php index 0cd5a64d9b..eea3b867f5 100644 --- a/libraries/plugins/export/ExportSql.class.php +++ b/libraries/plugins/export/ExportSql.class.php @@ -1572,7 +1572,7 @@ class ExportSql extends ExportPlugin $fields_cnt = PMA_DBI_num_fields($result); // Get field information - $fields_meta = PMA_DBI_get_fields_meta($result); + $fields_meta = PMA_DBI_getFieldsMeta($result); $field_flags = array(); for ($j = 0; $j < $fields_cnt; $j++) { $field_flags[$j] = PMA_DBI_field_flags($result, $j); diff --git a/libraries/plugins/export/PMA_ExportPdf.class.php b/libraries/plugins/export/PMA_ExportPdf.class.php index e1f266b917..c1c59b25a0 100644 --- a/libraries/plugins/export/PMA_ExportPdf.class.php +++ b/libraries/plugins/export/PMA_ExportPdf.class.php @@ -279,7 +279,7 @@ class PMA_ExportPdf extends PMA_PDF */ $this->results = PMA_DBI_query($query, null, PMA_DBI_QUERY_UNBUFFERED); $this->numFields = PMA_DBI_num_fields($this->results); - $this->fields = PMA_DBI_get_fields_meta($this->results); + $this->fields = PMA_DBI_getFieldsMeta($this->results); // sColWidth = starting col width (an average size width) $availableWidth = $this->w - $this->lMargin - $this->rMargin; diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index 6e3e2e230d..688424c390 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -1379,7 +1379,7 @@ function PMA_RTN_handleExecute() if (($result !== false) && ($num_rows > 0)) { $output .= ""; - foreach (PMA_DBI_get_fields_meta($result) as $key => $field) { + foreach (PMA_DBI_getFieldsMeta($result) as $key => $field) { $output .= ""; diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php index 44d79d1ffb..f5580b8fdb 100644 --- a/libraries/tbl_columns_definition_form.inc.php +++ b/libraries/tbl_columns_definition_form.inc.php @@ -143,7 +143,7 @@ if (isset($fields_meta)) { . PMA_Util::backquote($table) . ' LIMIT 1'; $move_columns_sql_result = PMA_DBI_tryQuery($move_columns_sql_query); - $move_columns = PMA_DBI_get_fields_meta($move_columns_sql_result); + $move_columns = PMA_DBI_getFieldsMeta($move_columns_sql_result); unset($move_columns_sql_query, $move_columns_sql_result); $header_cells[] = __('Move column'); diff --git a/libraries/tbl_views.lib.php b/libraries/tbl_views.lib.php index 2a49e1f61a..60b1645a9a 100644 --- a/libraries/tbl_views.lib.php +++ b/libraries/tbl_views.lib.php @@ -27,7 +27,7 @@ function PMA_getColumnMap($sql_query, $view_columns) if ($real_source_result !== false) { - $real_source_fields_meta = PMA_DBI_get_fields_meta($real_source_result); + $real_source_fields_meta = PMA_DBI_getFieldsMeta($real_source_result); if (count($real_source_fields_meta) > 0) { diff --git a/sql.php b/sql.php index edc2693059..0084747529 100644 --- a/sql.php +++ b/sql.php @@ -1027,7 +1027,7 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) { // Gets the list of fields properties if (isset($result) && $result) { - $fields_meta = PMA_DBI_get_fields_meta($result); + $fields_meta = PMA_DBI_getFieldsMeta($result); $fields_cnt = count($fields_meta); } @@ -1153,7 +1153,7 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) { // Gets the list of fields properties if (isset($result) && $result) { - $fields_meta = PMA_DBI_get_fields_meta($result); + $fields_meta = PMA_DBI_getFieldsMeta($result); $fields_cnt = count($fields_meta); } @@ -1504,7 +1504,7 @@ function getTableHtmlForMultipleQueries( $result = PMA_DBI_store_result(); $fields_meta = ($result !== false) - ? PMA_DBI_get_fields_meta($result) + ? PMA_DBI_getFieldsMeta($result) : array(); $fields_cnt = count($fields_meta); diff --git a/tbl_chart.php b/tbl_chart.php index d584ec646d..e68ba22796 100644 --- a/tbl_chart.php +++ b/tbl_chart.php @@ -103,7 +103,7 @@ if (strlen($GLOBALS['table'])) { $data = array(); $result = PMA_DBI_tryQuery($sql_query); -$fields_meta = PMA_DBI_get_fields_meta($result); +$fields_meta = PMA_DBI_getFieldsMeta($result); while ($row = PMA_DBI_fetchAssoc($result)) { $data[] = $row; } diff --git a/tbl_gis_visualization.php b/tbl_gis_visualization.php index cfcbb94d41..2c243bef6c 100644 --- a/tbl_gis_visualization.php +++ b/tbl_gis_visualization.php @@ -29,7 +29,7 @@ if (! isset($sql_query) || $sql_query == '') { // Execute the query and return the result $result = PMA_DBI_tryQuery($sql_query); // Get the meta data of results -$meta = PMA_DBI_get_fields_meta($result); +$meta = PMA_DBI_getFieldsMeta($result); // Find the candidate fields for label column and spatial column $labelCandidates = array(); $spatialCandidates = array(); diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php index 94a711f50c..8dd11b85fb 100644 --- a/tbl_zoom_select.php +++ b/tbl_zoom_select.php @@ -62,7 +62,7 @@ if (isset($_REQUEST['get_data_row']) && $_REQUEST['get_data_row'] == true) { $row_info_query = 'SELECT * FROM `' . $_REQUEST['db'] . '`.`' . $_REQUEST['table'] . '` WHERE ' . $_REQUEST['where_clause']; $result = PMA_DBI_query($row_info_query . ";", null, PMA_DBI_QUERY_STORE); - $fields_meta = PMA_DBI_get_fields_meta($result); + $fields_meta = PMA_DBI_getFieldsMeta($result); while ($row = PMA_DBI_fetchAssoc($result)) { // for bit fields we need to convert them to printable form $i = 0; @@ -139,7 +139,7 @@ if (isset($zoom_submit) //Query execution part $result = PMA_DBI_query($sql_query . ";", null, PMA_DBI_QUERY_STORE); - $fields_meta = PMA_DBI_get_fields_meta($result); + $fields_meta = PMA_DBI_getFieldsMeta($result); while ($row = PMA_DBI_fetchAssoc($result)) { //Need a row with indexes as 0,1,2 for the getUniqueCondition // hence using a temporary array From a0543cf6c8cb6773426ecc1e313f452c5cc6cc7c Mon Sep 17 00:00:00 2001 From: Kasun Chathuranga Date: Sat, 4 May 2013 08:44:26 +0530 Subject: [PATCH 20/36] PMA_DBI_num_fields --> PMA_DBI_numFields --- libraries/database_interface.lib.php | 2 +- libraries/dbi/drizzle.dbi.lib.php | 2 +- libraries/dbi/dummy.lib.php | 2 +- libraries/dbi/mysql.dbi.lib.php | 2 +- libraries/dbi/mysqli.dbi.lib.php | 2 +- libraries/plugins/export/ExportCsv.class.php | 2 +- libraries/plugins/export/ExportHtmlword.class.php | 2 +- libraries/plugins/export/ExportJson.class.php | 2 +- libraries/plugins/export/ExportLatex.class.php | 2 +- libraries/plugins/export/ExportMediawiki.class.php | 2 +- libraries/plugins/export/ExportOds.class.php | 2 +- libraries/plugins/export/ExportOdt.class.php | 2 +- libraries/plugins/export/ExportPhparray.class.php | 2 +- libraries/plugins/export/ExportSql.class.php | 2 +- libraries/plugins/export/ExportTexytext.class.php | 2 +- libraries/plugins/export/ExportXml.class.php | 2 +- libraries/plugins/export/ExportYaml.class.php | 2 +- libraries/plugins/export/PMA_ExportPdf.class.php | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index b14bc6da92..d021033262 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -1742,7 +1742,7 @@ function PMA_DBI_fetchResult($result, $key = null, $value = null, $fetch_function = 'PMA_DBI_fetchAssoc'; // no nested array if only one field is in result - if (null === $key && 1 === PMA_DBI_num_fields($result)) { + if (null === $key && 1 === PMA_DBI_numFields($result)) { $value = 0; $fetch_function = 'PMA_DBI_fetchRow'; } diff --git a/libraries/dbi/drizzle.dbi.lib.php b/libraries/dbi/drizzle.dbi.lib.php index 5e617eaa2c..4b77f38cda 100644 --- a/libraries/dbi/drizzle.dbi.lib.php +++ b/libraries/dbi/drizzle.dbi.lib.php @@ -548,7 +548,7 @@ function PMA_DBI_getFieldsMeta($result) * * @return int field count */ -function PMA_DBI_num_fields($result) +function PMA_DBI_numFields($result) { return $result->numColumns(); } diff --git a/libraries/dbi/dummy.lib.php b/libraries/dbi/dummy.lib.php index c4018746e0..e5d04f77dc 100644 --- a/libraries/dbi/dummy.lib.php +++ b/libraries/dbi/dummy.lib.php @@ -489,7 +489,7 @@ function PMA_DBI_affectedRows($link = null, $get_from_cache = true) * * @return int field count */ -function PMA_DBI_num_fields($result) +function PMA_DBI_numFields($result) { if (isset($GLOBALS['dummy_queries'][$result]['columns'])) { return count($GLOBALS['dummy_queries'][$result]['columns']); diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index 56b5f7a0b7..99b338127d 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -496,7 +496,7 @@ function PMA_DBI_getFieldsMeta($result) * * @return int field count */ -function PMA_DBI_num_fields($result) +function PMA_DBI_numFields($result) { return mysql_num_fields($result); } diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index ea0ea60d09..ba9bc3acce 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -639,7 +639,7 @@ function PMA_DBI_getFieldsMeta($result) * * @return int field count */ -function PMA_DBI_num_fields($result) +function PMA_DBI_numFields($result) { return mysqli_num_fields($result); } diff --git a/libraries/plugins/export/ExportCsv.class.php b/libraries/plugins/export/ExportCsv.class.php index bb06ac6c59..51dd71c8bd 100644 --- a/libraries/plugins/export/ExportCsv.class.php +++ b/libraries/plugins/export/ExportCsv.class.php @@ -247,7 +247,7 @@ class ExportCsv extends ExportPlugin // Gets the data from the database $result = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED); - $fields_cnt = PMA_DBI_num_fields($result); + $fields_cnt = PMA_DBI_numFields($result); // If required, get fields name at the first line if (isset($GLOBALS['csv_columns'])) { diff --git a/libraries/plugins/export/ExportHtmlword.class.php b/libraries/plugins/export/ExportHtmlword.class.php index a065bdf17d..5e01e4db88 100644 --- a/libraries/plugins/export/ExportHtmlword.class.php +++ b/libraries/plugins/export/ExportHtmlword.class.php @@ -213,7 +213,7 @@ class ExportHtmlword extends ExportPlugin // Gets the data from the database $result = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED); - $fields_cnt = PMA_DBI_num_fields($result); + $fields_cnt = PMA_DBI_numFields($result); // If required, get fields name at the first line if (isset($GLOBALS['htmlword_columns'])) { diff --git a/libraries/plugins/export/ExportJson.class.php b/libraries/plugins/export/ExportJson.class.php index 3405688dbf..3d5ef5d266 100644 --- a/libraries/plugins/export/ExportJson.class.php +++ b/libraries/plugins/export/ExportJson.class.php @@ -159,7 +159,7 @@ class ExportJson extends ExportPlugin public function exportData($db, $table, $crlf, $error_url, $sql_query) { $result = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED); - $columns_cnt = PMA_DBI_num_fields($result); + $columns_cnt = PMA_DBI_numFields($result); // Get field information $fields_meta = PMA_DBI_getFieldsMeta($result); diff --git a/libraries/plugins/export/ExportLatex.class.php b/libraries/plugins/export/ExportLatex.class.php index 57c1b88f23..1a00cfd18c 100644 --- a/libraries/plugins/export/ExportLatex.class.php +++ b/libraries/plugins/export/ExportLatex.class.php @@ -292,7 +292,7 @@ class ExportLatex extends ExportPlugin { $result = PMA_DBI_tryQuery($sql_query, null, PMA_DBI_QUERY_UNBUFFERED); - $columns_cnt = PMA_DBI_num_fields($result); + $columns_cnt = PMA_DBI_numFields($result); for ($i = 0; $i < $columns_cnt; $i++) { $columns[$i] = PMA_DBI_field_name($result, $i); } diff --git a/libraries/plugins/export/ExportMediawiki.class.php b/libraries/plugins/export/ExportMediawiki.class.php index 8e15f9f091..bb48814ce3 100644 --- a/libraries/plugins/export/ExportMediawiki.class.php +++ b/libraries/plugins/export/ExportMediawiki.class.php @@ -316,7 +316,7 @@ class ExportMediawiki extends ExportPlugin // Get the table data from the database $result = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED); - $fields_cnt = PMA_DBI_num_fields($result); + $fields_cnt = PMA_DBI_numFields($result); while ($row = PMA_DBI_fetchRow($result)) { $output .= "|-" . $this->_exportCRLF(); diff --git a/libraries/plugins/export/ExportOds.class.php b/libraries/plugins/export/ExportOds.class.php index 2752410963..81d822dc29 100644 --- a/libraries/plugins/export/ExportOds.class.php +++ b/libraries/plugins/export/ExportOds.class.php @@ -227,7 +227,7 @@ class ExportOds extends ExportPlugin // Gets the data from the database $result = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED); - $fields_cnt = PMA_DBI_num_fields($result); + $fields_cnt = PMA_DBI_numFields($result); $fields_meta = PMA_DBI_getFieldsMeta($result); $field_flags = array(); for ($j = 0; $j < $fields_cnt; $j++) { diff --git a/libraries/plugins/export/ExportOdt.class.php b/libraries/plugins/export/ExportOdt.class.php index 91aa32fd4e..60bfcabf42 100644 --- a/libraries/plugins/export/ExportOdt.class.php +++ b/libraries/plugins/export/ExportOdt.class.php @@ -245,7 +245,7 @@ class ExportOdt extends ExportPlugin // Gets the data from the database $result = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED); - $fields_cnt = PMA_DBI_num_fields($result); + $fields_cnt = PMA_DBI_numFields($result); $fields_meta = PMA_DBI_getFieldsMeta($result); $field_flags = array(); for ($j = 0; $j < $fields_cnt; $j++) { diff --git a/libraries/plugins/export/ExportPhparray.class.php b/libraries/plugins/export/ExportPhparray.class.php index 3f0ebe8bf8..1e8db5aef9 100644 --- a/libraries/plugins/export/ExportPhparray.class.php +++ b/libraries/plugins/export/ExportPhparray.class.php @@ -165,7 +165,7 @@ class ExportPhparray extends ExportPlugin { $result = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED); - $columns_cnt = PMA_DBI_num_fields($result); + $columns_cnt = PMA_DBI_numFields($result); for ($i = 0; $i < $columns_cnt; $i++) { $columns[$i] = stripslashes(PMA_DBI_field_name($result, $i)); } diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php index eea3b867f5..920a26b064 100644 --- a/libraries/plugins/export/ExportSql.class.php +++ b/libraries/plugins/export/ExportSql.class.php @@ -1569,7 +1569,7 @@ class ExportSql extends ExportPlugin } if ($result != false) { - $fields_cnt = PMA_DBI_num_fields($result); + $fields_cnt = PMA_DBI_numFields($result); // Get field information $fields_meta = PMA_DBI_getFieldsMeta($result); diff --git a/libraries/plugins/export/ExportTexytext.class.php b/libraries/plugins/export/ExportTexytext.class.php index 8a8735889a..e6bd40c72c 100644 --- a/libraries/plugins/export/ExportTexytext.class.php +++ b/libraries/plugins/export/ExportTexytext.class.php @@ -189,7 +189,7 @@ class ExportTexytext extends ExportPlugin // Gets the data from the database $result = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED); - $fields_cnt = PMA_DBI_num_fields($result); + $fields_cnt = PMA_DBI_numFields($result); // If required, get fields name at the first line if (isset($GLOBALS[$what . '_columns'])) { diff --git a/libraries/plugins/export/ExportXml.class.php b/libraries/plugins/export/ExportXml.class.php index d744819313..8067cd3856 100644 --- a/libraries/plugins/export/ExportXml.class.php +++ b/libraries/plugins/export/ExportXml.class.php @@ -447,7 +447,7 @@ class ExportXml extends ExportPlugin ) { $result = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED); - $columns_cnt = PMA_DBI_num_fields($result); + $columns_cnt = PMA_DBI_numFields($result); $columns = array(); for ($i = 0; $i < $columns_cnt; $i++) { $columns[$i] = stripslashes(PMA_DBI_field_name($result, $i)); diff --git a/libraries/plugins/export/ExportYaml.class.php b/libraries/plugins/export/ExportYaml.class.php index ffc64d5608..c3eb26a39c 100644 --- a/libraries/plugins/export/ExportYaml.class.php +++ b/libraries/plugins/export/ExportYaml.class.php @@ -158,7 +158,7 @@ class ExportYaml extends ExportPlugin { $result = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED); - $columns_cnt = PMA_DBI_num_fields($result); + $columns_cnt = PMA_DBI_numFields($result); for ($i = 0; $i < $columns_cnt; $i++) { $columns[$i] = stripslashes(PMA_DBI_field_name($result, $i)); } diff --git a/libraries/plugins/export/PMA_ExportPdf.class.php b/libraries/plugins/export/PMA_ExportPdf.class.php index c1c59b25a0..1053bf66aa 100644 --- a/libraries/plugins/export/PMA_ExportPdf.class.php +++ b/libraries/plugins/export/PMA_ExportPdf.class.php @@ -278,7 +278,7 @@ class PMA_ExportPdf extends PMA_PDF * Pass 1 for column widths */ $this->results = PMA_DBI_query($query, null, PMA_DBI_QUERY_UNBUFFERED); - $this->numFields = PMA_DBI_num_fields($this->results); + $this->numFields = PMA_DBI_numFields($this->results); $this->fields = PMA_DBI_getFieldsMeta($this->results); // sColWidth = starting col width (an average size width) From 12ef0bd6ca83baf75cc7430fcf181459baca2acf Mon Sep 17 00:00:00 2001 From: Kasun Chathuranga Date: Sat, 4 May 2013 08:45:13 +0530 Subject: [PATCH 21/36] PMA_DBI_field_len --> PMA_DBI_fieldLen --- libraries/dbi/drizzle.dbi.lib.php | 2 +- libraries/dbi/mysql.dbi.lib.php | 2 +- libraries/dbi/mysqli.dbi.lib.php | 2 +- tbl_change.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/dbi/drizzle.dbi.lib.php b/libraries/dbi/drizzle.dbi.lib.php index 4b77f38cda..3e4173f04f 100644 --- a/libraries/dbi/drizzle.dbi.lib.php +++ b/libraries/dbi/drizzle.dbi.lib.php @@ -561,7 +561,7 @@ function PMA_DBI_numFields($result) * * @return int length of field */ -function PMA_DBI_field_len($result, $i) +function PMA_DBI_fieldLen($result, $i) { $colums = $result->getColumns(); return $colums[$i]->size(); diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index 99b338127d..b1a6d45e56 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -509,7 +509,7 @@ function PMA_DBI_numFields($result) * * @return int length of field */ -function PMA_DBI_field_len($result, $i) +function PMA_DBI_fieldLen($result, $i) { return mysql_field_len($result, $i); } diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index ba9bc3acce..d7485b961a 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -652,7 +652,7 @@ function PMA_DBI_numFields($result) * * @return int length of field */ -function PMA_DBI_field_len($result, $i) +function PMA_DBI_fieldLen($result, $i) { return mysqli_fetch_field_direct($result, $i)->length; } diff --git a/tbl_change.php b/tbl_change.php index 2be72260ce..3f24e78c0b 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -292,7 +292,7 @@ foreach ($rows as $row_id => $current_row) { = PMA_Util::extractColumnSpec($column['Type']); if (-1 === $column['len']) { - $column['len'] = PMA_DBI_field_len($current_result, $i); + $column['len'] = PMA_DBI_fieldLen($current_result, $i); // length is unknown for geometry fields, // make enough space to edit very simple WKTs if (-1 === $column['len']) { From c5673e617769a37ab76b49a7bb805304dfdaa44b Mon Sep 17 00:00:00 2001 From: Kasun Chathuranga Date: Sat, 4 May 2013 08:46:06 +0530 Subject: [PATCH 22/36] PMA_DBI_field_name --> PMA_DBI_fieldName --- libraries/dbi/drizzle.dbi.lib.php | 2 +- libraries/dbi/mysql.dbi.lib.php | 2 +- libraries/dbi/mysqli.dbi.lib.php | 2 +- libraries/plugins/export/ExportCsv.class.php | 4 ++-- libraries/plugins/export/ExportHtmlword.class.php | 2 +- libraries/plugins/export/ExportJson.class.php | 2 +- libraries/plugins/export/ExportLatex.class.php | 2 +- libraries/plugins/export/ExportOds.class.php | 2 +- libraries/plugins/export/ExportOdt.class.php | 2 +- libraries/plugins/export/ExportPhparray.class.php | 2 +- libraries/plugins/export/ExportTexytext.class.php | 2 +- libraries/plugins/export/ExportXml.class.php | 2 +- libraries/plugins/export/ExportYaml.class.php | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/libraries/dbi/drizzle.dbi.lib.php b/libraries/dbi/drizzle.dbi.lib.php index 3e4173f04f..0e11ae72ac 100644 --- a/libraries/dbi/drizzle.dbi.lib.php +++ b/libraries/dbi/drizzle.dbi.lib.php @@ -575,7 +575,7 @@ function PMA_DBI_fieldLen($result, $i) * * @return string name of $i. field in $result */ -function PMA_DBI_field_name($result, $i) +function PMA_DBI_fieldName($result, $i) { $colums = $result->getColumns(); return $colums[$i]->name(); diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index b1a6d45e56..9d2efa198a 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -522,7 +522,7 @@ function PMA_DBI_fieldLen($result, $i) * * @return string name of $i. field in $result */ -function PMA_DBI_field_name($result, $i) +function PMA_DBI_fieldName($result, $i) { return mysql_field_name($result, $i); } diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index d7485b961a..31a48526a6 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -665,7 +665,7 @@ function PMA_DBI_fieldLen($result, $i) * * @return string name of $i. field in $result */ -function PMA_DBI_field_name($result, $i) +function PMA_DBI_fieldName($result, $i) { return mysqli_fetch_field_direct($result, $i)->name; } diff --git a/libraries/plugins/export/ExportCsv.class.php b/libraries/plugins/export/ExportCsv.class.php index 51dd71c8bd..a644a63068 100644 --- a/libraries/plugins/export/ExportCsv.class.php +++ b/libraries/plugins/export/ExportCsv.class.php @@ -254,13 +254,13 @@ class ExportCsv extends ExportPlugin $schema_insert = ''; for ($i = 0; $i < $fields_cnt; $i++) { if ($csv_enclosed == '') { - $schema_insert .= stripslashes(PMA_DBI_field_name($result, $i)); + $schema_insert .= stripslashes(PMA_DBI_fieldName($result, $i)); } else { $schema_insert .= $csv_enclosed . str_replace( $csv_enclosed, $csv_escaped . $csv_enclosed, - stripslashes(PMA_DBI_field_name($result, $i)) + stripslashes(PMA_DBI_fieldName($result, $i)) ) . $csv_enclosed; } diff --git a/libraries/plugins/export/ExportHtmlword.class.php b/libraries/plugins/export/ExportHtmlword.class.php index 5e01e4db88..e8875dda32 100644 --- a/libraries/plugins/export/ExportHtmlword.class.php +++ b/libraries/plugins/export/ExportHtmlword.class.php @@ -221,7 +221,7 @@ class ExportHtmlword extends ExportPlugin for ($i = 0; $i < $fields_cnt; $i++) { $schema_insert .= ''; } // end for diff --git a/libraries/plugins/export/ExportJson.class.php b/libraries/plugins/export/ExportJson.class.php index 3d5ef5d266..683e37765d 100644 --- a/libraries/plugins/export/ExportJson.class.php +++ b/libraries/plugins/export/ExportJson.class.php @@ -165,7 +165,7 @@ class ExportJson extends ExportPlugin $fields_meta = PMA_DBI_getFieldsMeta($result); for ($i = 0; $i < $columns_cnt; $i++) { - $columns[$i] = stripslashes(PMA_DBI_field_name($result, $i)); + $columns[$i] = stripslashes(PMA_DBI_fieldName($result, $i)); } unset($i); diff --git a/libraries/plugins/export/ExportLatex.class.php b/libraries/plugins/export/ExportLatex.class.php index 1a00cfd18c..295351d5bc 100644 --- a/libraries/plugins/export/ExportLatex.class.php +++ b/libraries/plugins/export/ExportLatex.class.php @@ -294,7 +294,7 @@ class ExportLatex extends ExportPlugin $columns_cnt = PMA_DBI_numFields($result); for ($i = 0; $i < $columns_cnt; $i++) { - $columns[$i] = PMA_DBI_field_name($result, $i); + $columns[$i] = PMA_DBI_fieldName($result, $i); } unset($i); diff --git a/libraries/plugins/export/ExportOds.class.php b/libraries/plugins/export/ExportOds.class.php index 81d822dc29..2be57c79b2 100644 --- a/libraries/plugins/export/ExportOds.class.php +++ b/libraries/plugins/export/ExportOds.class.php @@ -245,7 +245,7 @@ class ExportOds extends ExportPlugin '' . '' . htmlspecialchars( - stripslashes(PMA_DBI_field_name($result, $i)) + stripslashes(PMA_DBI_fieldName($result, $i)) ) . '' . ''; diff --git a/libraries/plugins/export/ExportOdt.class.php b/libraries/plugins/export/ExportOdt.class.php index 60bfcabf42..55ad759d14 100644 --- a/libraries/plugins/export/ExportOdt.class.php +++ b/libraries/plugins/export/ExportOdt.class.php @@ -270,7 +270,7 @@ class ExportOdt extends ExportPlugin '' . '' . htmlspecialchars( - stripslashes(PMA_DBI_field_name($result, $i)) + stripslashes(PMA_DBI_fieldName($result, $i)) ) . '' . ''; diff --git a/libraries/plugins/export/ExportPhparray.class.php b/libraries/plugins/export/ExportPhparray.class.php index 1e8db5aef9..4fafacc29d 100644 --- a/libraries/plugins/export/ExportPhparray.class.php +++ b/libraries/plugins/export/ExportPhparray.class.php @@ -167,7 +167,7 @@ class ExportPhparray extends ExportPlugin $columns_cnt = PMA_DBI_numFields($result); for ($i = 0; $i < $columns_cnt; $i++) { - $columns[$i] = stripslashes(PMA_DBI_field_name($result, $i)); + $columns[$i] = stripslashes(PMA_DBI_fieldName($result, $i)); } unset($i); diff --git a/libraries/plugins/export/ExportTexytext.class.php b/libraries/plugins/export/ExportTexytext.class.php index e6bd40c72c..0134c5656b 100644 --- a/libraries/plugins/export/ExportTexytext.class.php +++ b/libraries/plugins/export/ExportTexytext.class.php @@ -197,7 +197,7 @@ class ExportTexytext extends ExportPlugin for ($i = 0; $i < $fields_cnt; $i++) { $text_output .= '|' . htmlspecialchars( - stripslashes(PMA_DBI_field_name($result, $i)) + stripslashes(PMA_DBI_fieldName($result, $i)) ); } // end for $text_output .= "\n|------\n"; diff --git a/libraries/plugins/export/ExportXml.class.php b/libraries/plugins/export/ExportXml.class.php index 8067cd3856..712463d12b 100644 --- a/libraries/plugins/export/ExportXml.class.php +++ b/libraries/plugins/export/ExportXml.class.php @@ -450,7 +450,7 @@ class ExportXml extends ExportPlugin $columns_cnt = PMA_DBI_numFields($result); $columns = array(); for ($i = 0; $i < $columns_cnt; $i++) { - $columns[$i] = stripslashes(PMA_DBI_field_name($result, $i)); + $columns[$i] = stripslashes(PMA_DBI_fieldName($result, $i)); } unset($i); diff --git a/libraries/plugins/export/ExportYaml.class.php b/libraries/plugins/export/ExportYaml.class.php index c3eb26a39c..06b7856e52 100644 --- a/libraries/plugins/export/ExportYaml.class.php +++ b/libraries/plugins/export/ExportYaml.class.php @@ -160,7 +160,7 @@ class ExportYaml extends ExportPlugin $columns_cnt = PMA_DBI_numFields($result); for ($i = 0; $i < $columns_cnt; $i++) { - $columns[$i] = stripslashes(PMA_DBI_field_name($result, $i)); + $columns[$i] = stripslashes(PMA_DBI_fieldName($result, $i)); } unset($i); From 413123bd74e28f22b8d01287bc2b2f6a4ce54e6c Mon Sep 17 00:00:00 2001 From: Kasun Chathuranga Date: Sat, 4 May 2013 08:46:53 +0530 Subject: [PATCH 23/36] PMA_DBI_field_flags --> PMA_DBI_fieldFlags --- libraries/DisplayResults.class.php | 4 ++-- libraries/Util.class.php | 2 +- libraries/dbi/drizzle.dbi.lib.php | 4 ++-- libraries/dbi/mysql.dbi.lib.php | 2 +- libraries/dbi/mysqli.dbi.lib.php | 4 ++-- libraries/plugins/export/ExportOds.class.php | 2 +- libraries/plugins/export/ExportOdt.class.php | 2 +- libraries/plugins/export/ExportSql.class.php | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index d8cc1b78d8..7c57411831 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -2860,7 +2860,7 @@ class PMA_DisplayResults // PMA_mysql_fetch_fields returns BLOB in place of // TEXT fields type so we have to ensure it's really a BLOB - $field_flags = PMA_DBI_field_flags($dt_result, $i); + $field_flags = PMA_DBI_fieldFlags($dt_result, $i); $vertical_display['data'][$row_no][$i] = $this->_getDataCellForBlobColumns( @@ -3839,7 +3839,7 @@ class PMA_DisplayResults ) { $is_analyse = $this->__get('is_analyse'); - $field_flags = PMA_DBI_field_flags($dt_result, $col_index); + $field_flags = PMA_DBI_fieldFlags($dt_result, $col_index); if (stristr($field_flags, self::BINARY_FIELD) && ($GLOBALS['cfg']['ProtectBinary'] == 'all' || $GLOBALS['cfg']['ProtectBinary'] == 'noblob') diff --git a/libraries/Util.class.php b/libraries/Util.class.php index 49d483c661..993e5391fc 100644 --- a/libraries/Util.class.php +++ b/libraries/Util.class.php @@ -2185,7 +2185,7 @@ class PMA_Util $condition = ''; $con_key = ''; $con_val = ''; - $field_flags = PMA_DBI_field_flags($handle, $i); + $field_flags = PMA_DBI_fieldFlags($handle, $i); $meta = $fields_meta[$i]; // do not use a column alias in a condition diff --git a/libraries/dbi/drizzle.dbi.lib.php b/libraries/dbi/drizzle.dbi.lib.php index 0e11ae72ac..8fc101451d 100644 --- a/libraries/dbi/drizzle.dbi.lib.php +++ b/libraries/dbi/drizzle.dbi.lib.php @@ -523,7 +523,7 @@ function PMA_DBI_getFieldsMeta($result) $c->charsetnr = $column->charset(); $c->type = $typeAr[$column->typeDrizzle()]; $c->_type = $column->type(); - $c->flags = PMA_DBI_field_flags($result, $k); + $c->flags = PMA_DBI_fieldFlags($result, $k); $c->_flags = $column->flags(); $c->multiple_key = (int) (bool) ($c->_flags & DRIZZLE_COLUMN_FLAGS_MULTIPLE_KEY); @@ -589,7 +589,7 @@ function PMA_DBI_fieldName($result, $i) * * @return string field flags */ -function PMA_DBI_field_flags($result, $i) +function PMA_DBI_fieldFlags($result, $i) { $columns = $result->getColumns(); $f = $columns[$i]; diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index 9d2efa198a..b93859c12e 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -535,7 +535,7 @@ function PMA_DBI_fieldName($result, $i) * * @return string field flags */ -function PMA_DBI_field_flags($result, $i) +function PMA_DBI_fieldFlags($result, $i) { return mysql_field_flags($result, $i); } diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 31a48526a6..a795dc8ccc 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -607,7 +607,7 @@ function PMA_DBI_getFieldsMeta($result) $fields[$k]->_type = $field->type; $fields[$k]->type = $typeAr[$field->type]; $fields[$k]->_flags = $field->flags; - $fields[$k]->flags = PMA_DBI_field_flags($result, $k); + $fields[$k]->flags = PMA_DBI_fieldFlags($result, $k); // Enhance the field objects for mysql-extension compatibilty //$flags = explode(' ', $fields[$k]->flags); @@ -678,7 +678,7 @@ function PMA_DBI_fieldName($result, $i) * * @return string field flags */ -function PMA_DBI_field_flags($result, $i) +function PMA_DBI_fieldFlags($result, $i) { // This is missing from PHP 5.2.5, see http://bugs.php.net/bug.php?id=44846 if (! defined('MYSQLI_ENUM_FLAG')) { diff --git a/libraries/plugins/export/ExportOds.class.php b/libraries/plugins/export/ExportOds.class.php index 2be57c79b2..bc96c05dac 100644 --- a/libraries/plugins/export/ExportOds.class.php +++ b/libraries/plugins/export/ExportOds.class.php @@ -231,7 +231,7 @@ class ExportOds extends ExportPlugin $fields_meta = PMA_DBI_getFieldsMeta($result); $field_flags = array(); for ($j = 0; $j < $fields_cnt; $j++) { - $field_flags[$j] = PMA_DBI_field_flags($result, $j); + $field_flags[$j] = PMA_DBI_fieldFlags($result, $j); } $GLOBALS['ods_buffer'] .= diff --git a/libraries/plugins/export/ExportOdt.class.php b/libraries/plugins/export/ExportOdt.class.php index 55ad759d14..f888d15010 100644 --- a/libraries/plugins/export/ExportOdt.class.php +++ b/libraries/plugins/export/ExportOdt.class.php @@ -249,7 +249,7 @@ class ExportOdt extends ExportPlugin $fields_meta = PMA_DBI_getFieldsMeta($result); $field_flags = array(); for ($j = 0; $j < $fields_cnt; $j++) { - $field_flags[$j] = PMA_DBI_field_flags($result, $j); + $field_flags[$j] = PMA_DBI_fieldFlags($result, $j); } $GLOBALS['odt_buffer'] .= diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php index 920a26b064..42c8ac6d27 100644 --- a/libraries/plugins/export/ExportSql.class.php +++ b/libraries/plugins/export/ExportSql.class.php @@ -1575,7 +1575,7 @@ class ExportSql extends ExportPlugin $fields_meta = PMA_DBI_getFieldsMeta($result); $field_flags = array(); for ($j = 0; $j < $fields_cnt; $j++) { - $field_flags[$j] = PMA_DBI_field_flags($result, $j); + $field_flags[$j] = PMA_DBI_fieldFlags($result, $j); } for ($j = 0; $j < $fields_cnt; $j++) { From 9d7c6e141b232fc31cde7280afd5322c7190e2eb Mon Sep 17 00:00:00 2001 From: Kasun Chathuranga Date: Sat, 4 May 2013 08:47:49 +0530 Subject: [PATCH 24/36] PMA_DBI_store_result --> PMA_DBI_storeResult --- libraries/dbi/drizzle.dbi.lib.php | 2 +- libraries/dbi/mysql.dbi.lib.php | 2 +- libraries/dbi/mysqli.dbi.lib.php | 2 +- libraries/rte/rte_routines.lib.php | 2 +- sql.php | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/dbi/drizzle.dbi.lib.php b/libraries/dbi/drizzle.dbi.lib.php index 8fc101451d..151d22712c 100644 --- a/libraries/dbi/drizzle.dbi.lib.php +++ b/libraries/dbi/drizzle.dbi.lib.php @@ -659,7 +659,7 @@ function PMA_DBI_fieldFlags($result, $i) * * @return false */ -function PMA_DBI_store_result() +function PMA_DBI_storeResult() { return false; } diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index b93859c12e..20ccff8709 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -545,7 +545,7 @@ function PMA_DBI_fieldFlags($result, $i) * * @return false */ -function PMA_DBI_store_result() +function PMA_DBI_storeResult() { return false; } diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index a795dc8ccc..5731af459e 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -386,7 +386,7 @@ function PMA_DBI_nextResult($link = null) * * @return mixed false when empty results / result set when not empty */ -function PMA_DBI_store_result() +function PMA_DBI_storeResult() { if (empty($link)) { if (isset($GLOBALS['userlink'])) { diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index 688424c390..e6550f5301 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -1373,7 +1373,7 @@ function PMA_RTN_handleExecute() do { - $result = PMA_DBI_store_result(); + $result = PMA_DBI_storeResult(); $num_rows = PMA_DBI_numRows($result); if (($result !== false) && ($num_rows > 0)) { diff --git a/sql.php b/sql.php index 0084747529..38a4f1a9e0 100644 --- a/sql.php +++ b/sql.php @@ -639,7 +639,7 @@ if (isset($GLOBALS['show_as_php']) || ! empty($GLOBALS['validatequery'])) { // If a stored procedure was called, there may be more results that are // queued up and waiting to be flushed from the buffer. So let's do that. do { - PMA_DBI_store_result(); + PMA_DBI_storeResult(); if (! PMA_DBI_moreResults()) { break; } @@ -1502,7 +1502,7 @@ function getTableHtmlForMultipleQueries( $analyzed_sql = array(); $is_affected = false; - $result = PMA_DBI_store_result(); + $result = PMA_DBI_storeResult(); $fields_meta = ($result !== false) ? PMA_DBI_getFieldsMeta($result) : array(); From 9da7bfa6eeed952ce7588df6de82d3ff1d2ed99b Mon Sep 17 00:00:00 2001 From: Kasun Chathuranga Date: Sat, 4 May 2013 08:49:32 +0530 Subject: [PATCH 25/36] PMA_DBI_fetch_any --> PMA_DBI_fetchAny --- libraries/dbi/dummy.lib.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/dbi/dummy.lib.php b/libraries/dbi/dummy.lib.php index e5d04f77dc..c841bffff2 100644 --- a/libraries/dbi/dummy.lib.php +++ b/libraries/dbi/dummy.lib.php @@ -341,7 +341,7 @@ function PMA_DBI_realQuery($query, $link = null, $options = 0) * * @return array */ -function PMA_DBI_fetch_any($result) +function PMA_DBI_fetchAny($result) { $query_data = $GLOBALS['dummy_queries'][$result]; if ($query_data['pos'] >= count($query_data['result'])) { @@ -361,7 +361,7 @@ function PMA_DBI_fetch_any($result) */ function PMA_DBI_fetchArray($result) { - $data = PMA_DBI_fetch_any($result); + $data = PMA_DBI_fetchAny($result); if (is_array($data) && isset($GLOBALS['dummy_queries'][$result]['columns'])) { foreach ($data as $key => $val) { $data[$GLOBALS['dummy_queries'][$result]['columns'][$key]] = $val; @@ -380,7 +380,7 @@ function PMA_DBI_fetchArray($result) */ function PMA_DBI_fetchAssoc($result) { - $data = PMA_DBI_fetch_any($result); + $data = PMA_DBI_fetchAny($result); if (is_array($data) && isset($GLOBALS['dummy_queries'][$result]['columns'])) { $ret = array(); foreach ($data as $key => $val) { @@ -400,7 +400,7 @@ function PMA_DBI_fetchAssoc($result) */ function PMA_DBI_fetchRow($result) { - $data = PMA_DBI_fetch_any($result); + $data = PMA_DBI_fetchAny($result); return $data; } From 7261550e1a8e5431d7becf0b7884e048ec67398a Mon Sep 17 00:00:00 2001 From: Kasun Chathuranga Date: Sat, 4 May 2013 09:01:25 +0530 Subject: [PATCH 26/36] ChangeLog entry for PMA_DBI functions in database interface libraries renaming --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 96131e7381..cf0cc00204 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog + PMA_DBI functions in database_interface.lib.php renamed to be compliant with PEAR standards + [interface] Make warning about existing config directory clearer + rfe #1414 Allow specifying controlport ++ PMA_DBI functions in database interface libraries renamed to be compliant with PEAR standards 4.0.1.0 (not yet released) - bug #3879 Import broken for CSV using LOAD DATA From 53d7c5829b3a16146199d5e9a188dfb62a22d71a Mon Sep 17 00:00:00 2001 From: Kasun Chathuranga Date: Sun, 5 May 2013 21:06:57 +0530 Subject: [PATCH 27/36] Fix more instances of naming style violations related to PMA_DBI functions --- sql.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sql.php b/sql.php index 9a69bc2ee9..a007464317 100644 --- a/sql.php +++ b/sql.php @@ -526,7 +526,7 @@ if (($_SESSION['tmp_user_values']['max_rows'] != 'all') } if (strlen($db)) { - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); } // E x e c u t e t h e q u e r y @@ -549,11 +549,11 @@ if (isset($GLOBALS['show_as_php']) || ! empty($GLOBALS['validatequery'])) { // If a stored procedure was called, there may be more results that are // queued up and waiting to be flushed from the buffer. So let's do that. do { - PMA_DBI_store_result(); - if (! PMA_DBI_more_results()) { + PMA_DBI_storeResult(); + if (! PMA_DBI_moreResults()) { break; } - } while (PMA_DBI_next_result()); + } while (PMA_DBI_nextResult()); $is_procedure = false; if (stripos($full_sql_query, 'call') !== false) { @@ -628,9 +628,9 @@ if (isset($GLOBALS['show_as_php']) || ! empty($GLOBALS['validatequery'])) { // mysql_affected_rows() reports about the last query done) if (! $is_affected) { - $num_rows = ($result) ? @PMA_DBI_num_rows($result) : 0; + $num_rows = ($result) ? @PMA_DBI_numRows($result) : 0; } elseif (! isset($num_rows)) { - $num_rows = @PMA_DBI_affected_rows(); + $num_rows = @PMA_DBI_affectedRows(); } // Grabs the profiling results @@ -815,7 +815,7 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) { } else { $message = PMA_Message::getMessageForInsertedRows($num_rows); } - $insert_id = PMA_DBI_insert_id(); + $insert_id = PMA_DBI_insertId(); if ($insert_id != 0) { // insert_id is id of FIRST record inserted in one insert, // so if we inserted multiple rows, we had to increment this @@ -922,7 +922,7 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) { //If we are retrieving the full value of a truncated field or the original // value of a transformed field, show it here and exit if ($GLOBALS['grid_edit'] == true) { - $row = PMA_DBI_fetch_row($result); + $row = PMA_DBI_fetchRow($result); $response = PMA_Response::getInstance(); $response->addJSON('value', $row[0]); exit; @@ -1181,7 +1181,7 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) { ); $html_output .= $displayResultsObject->getTable($result, $disp_mode, $analyzed_sql); - PMA_DBI_free_result($result); + PMA_DBI_freeResult($result); } // BEGIN INDEX CHECK See if indexes should be checked. From ee24d278dd5f9f1f57ad4763e577abe523cc0014 Mon Sep 17 00:00:00 2001 From: Giovanni Sora Date: Sun, 5 May 2013 22:29:51 +0200 Subject: [PATCH 28/36] Translated using Weblate (Interlingua) Currently translated at 6.4% (170 of 2652) --- po/ia.po | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/po/ia.po b/po/ia.po index 2f1efad38a..988ec83191 100644 --- a/po/ia.po +++ b/po/ia.po @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-05-03 15:57+0200\n" -"PO-Revision-Date: 2013-05-02 14:08+0200\n" +"PO-Revision-Date: 2013-05-05 22:29+0200\n" "Last-Translator: Giovanni Sora \n" -"Language-Team: Interlingua \n" +"Language-Team: Interlingua " +"\n" "Language: ia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -826,6 +826,9 @@ msgid "" "Login cookie store is lower than cookie validity configured in phpMyAdmin, " "because of this, your login will expire sooner than configured in phpMyAdmin." msgstr "" +"Immagazinage del cookie de authenticar se es inferior al validitate de " +"cookie configurate in phpMyAdmin, pro iste ration, tu\n" +"accesso expirara plus tosto que lo que es configurate in phpMyAdmin." #: index.php:449 msgid "The configuration file now needs a secret passphrase (blowfish_secret)." @@ -856,6 +859,8 @@ msgid "" "Your PHP MySQL library version %s differs from your MySQL server version %s. " "This may cause unpredictable behavior." msgstr "" +"Tu biblioteca de PHP MySQL version %s differe ex tu version de vervitor " +"MySQL %s. Isto poterea causar comportamentos imprevisibile." #: index.php:525 #, php-format @@ -863,10 +868,12 @@ msgid "" "Server running with Suhosin. Please refer to %sdocumentation%s for possible " "issues." msgstr "" +"Sur le servitor es executante Suhosin. Controla le documentation: %" +"sdocumentation%s pro possibile problema." #: js/messages.php:27 libraries/import.lib.php:118 sql.php:355 msgid "\"DROP DATABASE\" statements are disabled." -msgstr "" +msgstr "Commandos \"DROP DATABASE\" es dishabilitate." #: js/messages.php:30 #, php-format @@ -875,11 +882,11 @@ msgstr "Tu es vermente secur que tu vole executar \"%s\"?" #: js/messages.php:31 libraries/mult_submits.inc.php:316 sql.php:477 msgid "You are about to DESTROY a complete database!" -msgstr "" +msgstr "Tu es per DESTRUER un complete base de datos!" #: js/messages.php:32 msgid "You are about to DESTROY a complete table!" -msgstr "" +msgstr "Tu es per DESTRUER un tabula complete!" #: js/messages.php:33 msgid "You are about to TRUNCATE a complete table!" @@ -907,16 +914,16 @@ msgstr "" #: js/messages.php:42 msgid "Add Index" -msgstr "" +msgstr "Adde indice" #: js/messages.php:43 msgid "Edit Index" -msgstr "" +msgstr "Modifica indice" #: js/messages.php:44 tbl_indexes.php:349 tbl_indexes.php:357 #, php-format msgid "Add %s column(s) to index" -msgstr "" +msgstr "Adde %s columna(s) al indice" #. l10n: Default label for the y-Axis of Charts #: js/messages.php:48 tbl_chart.php:236 @@ -925,32 +932,32 @@ msgstr "" #: js/messages.php:51 msgid "The host name is empty!" -msgstr "" +msgstr "Le nomine de hospite es vacue!" #: js/messages.php:52 msgid "The user name is empty!" -msgstr "" +msgstr "Le nomine de usator es vacue!" #: js/messages.php:53 libraries/server_privileges.lib.php:1311 #: user_password.php:110 msgid "The password is empty!" -msgstr "" +msgstr "Le contrassigno es vacue!" #: js/messages.php:54 libraries/server_privileges.lib.php:1309 #: user_password.php:113 msgid "The passwords aren't the same!" -msgstr "" +msgstr "Le contrasignos non es le mesme!" #: js/messages.php:55 libraries/server_privileges.lib.php:1439 #: libraries/server_privileges.lib.php:1629 #: libraries/server_privileges.lib.php:2537 #: libraries/server_privileges.lib.php:2839 msgid "Add user" -msgstr "" +msgstr "Adde usator" #: js/messages.php:56 msgid "Reloading Privileges" -msgstr "" +msgstr "Recargante privilegios" #: js/messages.php:57 msgid "Removing Selected Users" From b6b46e37e61aabdd4b423dd79124770e22d3f8e0 Mon Sep 17 00:00:00 2001 From: adamgsoc2013 Date: Mon, 6 May 2013 17:12:18 +0800 Subject: [PATCH 29/36] add test case for class Node_Column --- .../navigation/PMA_Node_Column_test.php | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 test/classes/navigation/PMA_Node_Column_test.php diff --git a/test/classes/navigation/PMA_Node_Column_test.php b/test/classes/navigation/PMA_Node_Column_test.php new file mode 100644 index 0000000000..5d9ffaecd0 --- /dev/null +++ b/test/classes/navigation/PMA_Node_Column_test.php @@ -0,0 +1,47 @@ +assertArrayHasKey( + 'text', + $parent->links + ); + } + + public function testAddNode() + { + $parent = PMA_NodeFactory::getInstance('Node_Column', 'parent'); + $child = PMA_NodeFactory::getInstance('Node_Column', 'child'); + $parent->addChild($child); + $this->assertEquals( + $parent->getChild($child->name), + $child + ); + $this->assertEquals( + $parent->getChild($child->real_name, true), + $child + ); + } +} +?> From f0d9188a8d712357a30c2e1f09ba212d947b7abe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20D=C3=A4ster?= Date: Mon, 6 May 2013 11:06:03 +0200 Subject: [PATCH 30/36] Translated using Weblate (German) Currently translated at 96.5% (2558 of 2650) --- po/de.po | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/po/de.po b/po/de.po index b078a63680..902be15d94 100644 --- a/po/de.po +++ b/po/de.po @@ -4,10 +4,9 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-05-03 15:57+0200\n" -"PO-Revision-Date: 2013-04-26 09:30+0200\n" -"Last-Translator: J. M. \n" -"Language-Team: German \n" +"PO-Revision-Date: 2013-05-06 11:06+0200\n" +"Last-Translator: David Däster \n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -7939,7 +7938,7 @@ msgstr "" #: libraries/plugins/auth/AuthenticationConfig.class.php:142 msgid "Retry to connect" -msgstr "" +msgstr "Versuche einen neuen Verbindungsaufbau" #: libraries/plugins/auth/AuthenticationCookie.class.php:44 msgid "Failed to use Blowfish from mcrypt!" From 685fcab5ce3e6fbbce1ad4a31f27820fda1b8685 Mon Sep 17 00:00:00 2001 From: Anusuk Sangubon Date: Mon, 6 May 2013 11:03:11 +0200 Subject: [PATCH 31/36] Translated using Weblate (Thai) Currently translated at 33.3% (882 of 2652) --- po/th.po | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/po/th.po b/po/th.po index b9f87efd5b..7e382e5bab 100644 --- a/po/th.po +++ b/po/th.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-05-03 15:57+0200\n" -"PO-Revision-Date: 2012-11-12 11:31+0200\n" -"Last-Translator: Michal Čihař \n" +"PO-Revision-Date: 2013-05-06 11:03+0200\n" +"Last-Translator: Anusuk Sangubon \n" "Language-Team: Thai \n" "Language: th\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 1.3-dev\n" +"X-Generator: Weblate 1.6-dev\n" #: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:335 #: libraries/DisplayResults.class.php:809 @@ -6713,9 +6713,8 @@ msgid "Language" msgstr "" #: libraries/engines/bdb.lib.php:25 -#, fuzzy msgid "Version information" -msgstr "ข้อมูลล็อกอิน" +msgstr "ข้อมูลเวอร์ชัน" #: libraries/engines/innodb.lib.php:28 msgid "Data home directory" From 87f98e4d8420d29782f70ac50ebc669298374940 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 6 May 2013 15:24:34 +0200 Subject: [PATCH 32/36] Fix function name --- sql.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sql.php b/sql.php index a007464317..e3712d417c 100644 --- a/sql.php +++ b/sql.php @@ -937,7 +937,7 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) { // Gets the list of fields properties if (isset($result) && $result) { - $fields_meta = PMA_DBI_get_fields_meta($result); + $fields_meta = PMA_DBI_getFieldsMeta($result); $fields_cnt = count($fields_meta); } @@ -1063,7 +1063,7 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) { // Gets the list of fields properties if (isset($result) && $result) { - $fields_meta = PMA_DBI_get_fields_meta($result); + $fields_meta = PMA_DBI_getFieldsMeta($result); $fields_cnt = count($fields_meta); } From 8555e00aec0eb120dbd0953190123a7f39bd7e9e Mon Sep 17 00:00:00 2001 From: adamgsoc2013 Date: Mon, 6 May 2013 21:41:33 +0800 Subject: [PATCH 33/36] add test case for PMA_Node_Column PMA_Node_Database PMA_Node_Event --- .../navigation/PMA_Node_Column_test.php | 4 ++ .../navigation/PMA_Node_Database_test.php | 51 +++++++++++++++++++ .../navigation/PMA_Node_Event_test.php | 51 +++++++++++++++++++ 3 files changed, 106 insertions(+) create mode 100644 test/classes/navigation/PMA_Node_Database_test.php create mode 100644 test/classes/navigation/PMA_Node_Event_test.php diff --git a/test/classes/navigation/PMA_Node_Column_test.php b/test/classes/navigation/PMA_Node_Column_test.php index 5d9ffaecd0..141ddde59f 100644 --- a/test/classes/navigation/PMA_Node_Column_test.php +++ b/test/classes/navigation/PMA_Node_Column_test.php @@ -27,6 +27,10 @@ class Node_Column_Test extends PHPUnit_Framework_TestCase 'text', $parent->links ); + $this->assertContains( + 'tbl_structure.php', + $parent->links['text'] + ); } public function testAddNode() diff --git a/test/classes/navigation/PMA_Node_Database_test.php b/test/classes/navigation/PMA_Node_Database_test.php new file mode 100644 index 0000000000..093686f13f --- /dev/null +++ b/test/classes/navigation/PMA_Node_Database_test.php @@ -0,0 +1,51 @@ +assertArrayHasKey( + 'text', + $parent->links + ); + $this->assertContains( + 'db_structure.php', + $parent->links['text'] + ); + } + + public function testAddNode() + { + $parent = PMA_NodeFactory::getInstance('Node_Database', 'parent'); + $child = PMA_NodeFactory::getInstance('Node_Database', 'child'); + $parent->addChild($child); + $this->assertEquals( + $parent->getChild($child->name), + $child + ); + $this->assertEquals( + $parent->getChild($child->real_name, true), + $child + ); + } +} +?> diff --git a/test/classes/navigation/PMA_Node_Event_test.php b/test/classes/navigation/PMA_Node_Event_test.php new file mode 100644 index 0000000000..5187f244a8 --- /dev/null +++ b/test/classes/navigation/PMA_Node_Event_test.php @@ -0,0 +1,51 @@ +assertArrayHasKey( + 'text', + $parent->links + ); + $this->assertContains( + 'db_events.php', + $parent->links['text'] + ); + } + + public function testAddNode() + { + $parent = PMA_NodeFactory::getInstance('Node_Event', 'parent'); + $child = PMA_NodeFactory::getInstance('Node_Event', 'child'); + $parent->addChild($child); + $this->assertEquals( + $parent->getChild($child->name), + $child + ); + $this->assertEquals( + $parent->getChild($child->real_name, true), + $child + ); + } +} +?> From fce4d79b959ae2d864d05aa2502d98cdf515e702 Mon Sep 17 00:00:00 2001 From: adamgsoc2013 Date: Mon, 6 May 2013 22:01:15 +0800 Subject: [PATCH 34/36] add test case for PMA_Node classes --- .../navigation/PMA_Node_Function_test.php | 51 +++++++++++++++++++ .../navigation/PMA_Node_Index_test.php | 51 +++++++++++++++++++ .../navigation/PMA_Node_Procedure_test.php | 51 +++++++++++++++++++ 3 files changed, 153 insertions(+) create mode 100644 test/classes/navigation/PMA_Node_Function_test.php create mode 100644 test/classes/navigation/PMA_Node_Index_test.php create mode 100644 test/classes/navigation/PMA_Node_Procedure_test.php diff --git a/test/classes/navigation/PMA_Node_Function_test.php b/test/classes/navigation/PMA_Node_Function_test.php new file mode 100644 index 0000000000..698a670477 --- /dev/null +++ b/test/classes/navigation/PMA_Node_Function_test.php @@ -0,0 +1,51 @@ +assertArrayHasKey( + 'text', + $parent->links + ); + $this->assertContains( + 'db_routines.php', + $parent->links['text'] + ); + } + + public function testAddNode() + { + $parent = PMA_NodeFactory::getInstance('Node_Function', 'parent'); + $child = PMA_NodeFactory::getInstance('Node_Function', 'child'); + $parent->addChild($child); + $this->assertEquals( + $parent->getChild($child->name), + $child + ); + $this->assertEquals( + $parent->getChild($child->real_name, true), + $child + ); + } +} +?> diff --git a/test/classes/navigation/PMA_Node_Index_test.php b/test/classes/navigation/PMA_Node_Index_test.php new file mode 100644 index 0000000000..8d8d875985 --- /dev/null +++ b/test/classes/navigation/PMA_Node_Index_test.php @@ -0,0 +1,51 @@ +assertArrayHasKey( + 'text', + $parent->links + ); + $this->assertContains( + 'tbl_indexes.php', + $parent->links['text'] + ); + } + + public function testAddNode() + { + $parent = PMA_NodeFactory::getInstance('Node_Index', 'parent'); + $child = PMA_NodeFactory::getInstance('Node_Index', 'child'); + $parent->addChild($child); + $this->assertEquals( + $parent->getChild($child->name), + $child + ); + $this->assertEquals( + $parent->getChild($child->real_name, true), + $child + ); + } +} +?> diff --git a/test/classes/navigation/PMA_Node_Procedure_test.php b/test/classes/navigation/PMA_Node_Procedure_test.php new file mode 100644 index 0000000000..66b724cafa --- /dev/null +++ b/test/classes/navigation/PMA_Node_Procedure_test.php @@ -0,0 +1,51 @@ +assertArrayHasKey( + 'text', + $parent->links + ); + $this->assertContains( + 'db_routines.php', + $parent->links['text'] + ); + } + + public function testAddNode() + { + $parent = PMA_NodeFactory::getInstance('Node_Procedure', 'parent'); + $child = PMA_NodeFactory::getInstance('Node_Procedure', 'child'); + $parent->addChild($child); + $this->assertEquals( + $parent->getChild($child->name), + $child + ); + $this->assertEquals( + $parent->getChild($child->real_name, true), + $child + ); + } +} +?> From a0cfa5cde83e0d1907409d690ba1b9b40f00ef9a Mon Sep 17 00:00:00 2001 From: adamgsoc2013 Date: Mon, 6 May 2013 22:02:31 +0800 Subject: [PATCH 35/36] add more case for other PMA_Node class --- .../navigation/PMA_Node_Table_test.php | 51 +++++++++++++++++++ .../navigation/PMA_Node_Trigger_test.php | 51 +++++++++++++++++++ .../classes/navigation/PMA_Node_View_test.php | 51 +++++++++++++++++++ 3 files changed, 153 insertions(+) create mode 100644 test/classes/navigation/PMA_Node_Table_test.php create mode 100644 test/classes/navigation/PMA_Node_Trigger_test.php create mode 100644 test/classes/navigation/PMA_Node_View_test.php diff --git a/test/classes/navigation/PMA_Node_Table_test.php b/test/classes/navigation/PMA_Node_Table_test.php new file mode 100644 index 0000000000..dd74e296d7 --- /dev/null +++ b/test/classes/navigation/PMA_Node_Table_test.php @@ -0,0 +1,51 @@ +assertArrayHasKey( + 'text', + $parent->links + ); + $this->assertContains( + 'sql.php', + $parent->links['text'] + ); + } + + public function testAddNode() + { + $parent = PMA_NodeFactory::getInstance('Node_Table', 'parent'); + $child = PMA_NodeFactory::getInstance('Node_Table', 'child'); + $parent->addChild($child); + $this->assertEquals( + $parent->getChild($child->name), + $child + ); + $this->assertEquals( + $parent->getChild($child->real_name, true), + $child + ); + } +} +?> diff --git a/test/classes/navigation/PMA_Node_Trigger_test.php b/test/classes/navigation/PMA_Node_Trigger_test.php new file mode 100644 index 0000000000..82544c58cd --- /dev/null +++ b/test/classes/navigation/PMA_Node_Trigger_test.php @@ -0,0 +1,51 @@ +assertArrayHasKey( + 'text', + $parent->links + ); + $this->assertContains( + 'db_triggers.php', + $parent->links['text'] + ); + } + + public function testAddNode() + { + $parent = PMA_NodeFactory::getInstance('Node_Trigger', 'parent'); + $child = PMA_NodeFactory::getInstance('Node_Trigger', 'child'); + $parent->addChild($child); + $this->assertEquals( + $parent->getChild($child->name), + $child + ); + $this->assertEquals( + $parent->getChild($child->real_name, true), + $child + ); + } +} +?> diff --git a/test/classes/navigation/PMA_Node_View_test.php b/test/classes/navigation/PMA_Node_View_test.php new file mode 100644 index 0000000000..1564386352 --- /dev/null +++ b/test/classes/navigation/PMA_Node_View_test.php @@ -0,0 +1,51 @@ +assertArrayHasKey( + 'text', + $parent->links + ); + $this->assertContains( + 'sql.php', + $parent->links['text'] + ); + } + + public function testAddNode() + { + $parent = PMA_NodeFactory::getInstance('Node_View', 'parent'); + $child = PMA_NodeFactory::getInstance('Node_View', 'child'); + $parent->addChild($child); + $this->assertEquals( + $parent->getChild($child->name), + $child + ); + $this->assertEquals( + $parent->getChild($child->real_name, true), + $child + ); + } +} +?> From 14e464c2566229490cc1607ce802b244521e7e0c Mon Sep 17 00:00:00 2001 From: adamgsoc2013 Date: Mon, 6 May 2013 23:48:59 +0800 Subject: [PATCH 36/36] add PMA_Form_test for class config/From --- test/classes/config/PMA_Form_test.php | 33 +++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 test/classes/config/PMA_Form_test.php diff --git a/test/classes/config/PMA_Form_test.php b/test/classes/config/PMA_Form_test.php new file mode 100644 index 0000000000..4cb107e0c1 --- /dev/null +++ b/test/classes/config/PMA_Form_test.php @@ -0,0 +1,33 @@ +assertEquals( + 1, + $form->index + ); + $this->assertEquals( + 'pma_form_name', + $form->name + ); + $this->assertArrayHasKey( + 'pma_form1', + $form->fields + ); + } +} +?>
"; $output .= htmlspecialchars($field->name); $output .= "' . htmlspecialchars( - stripslashes(PMA_DBI_field_name($result, $i)) + stripslashes(PMA_DBI_fieldName($result, $i)) ) . '