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

Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Browse Source
This commit is contained in:
Madhura Jayaratne 2013-05-06 22:33:27 +05:30
commit 5eb6af99c1
109 changed files with 1051 additions and 554 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -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

4
db_datadict.php
View File

@ -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();

4
db_operations.php
View File

@ -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);

20
db_printview.php
View File

@ -37,28 +37,28 @@ $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) {
while ($tmp = PMA_DBI_fetch_row($result)) {
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])) {
$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);
if ($result != false && PMA_DBI_num_rows($result) > 0) {
while ($tmp = PMA_DBI_fetch_row($result)) {
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) . '\';');
$sts_tmp = PMA_DBI_fetch_assoc($sts_result);
$sts_tmp = PMA_DBI_fetchAssoc($sts_result);
$tables[] = $sts_tmp;
} else { // table in use
$tables[] = array('Name' => $tmp[0]);
}
}
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
$sot_ready = true;
}
}
@ -68,11 +68,11 @@ 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) {
while ($sts_tmp = PMA_DBI_fetch_assoc($result)) {
if (PMA_DBI_numRows($result) > 0) {
while ($sts_tmp = PMA_DBI_fetchAssoc($result)) {
$tables[] = $sts_tmp;
}
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
unset($res);
}
}

6
db_tracking.php
View File

@ -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) {
?>
<div id="tracked_tables">
<h3><?php echo __('Tracked tables');?></h3>
@ -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');

2
export.php
View File

@ -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;

2
import.php
View File

@ -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']);

12
index.php
View File

@ -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 .= ')';
@ -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(
@ -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)

8
libraries/DBQbe.class.php
View File

@ -263,13 +263,13 @@ 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;
}
// 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])
@ -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';
@ -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

4
libraries/DbSearch.class.php
View File

@ -153,8 +153,8 @@ class PMA_DbSearch
*
* @todo can we make use of fulltextsearch IN BOOLEAN MODE for this?
* PMA_backquote
* PMA_DBI_free_result
* PMA_DBI_fetch_assoc
* PMA_DBI_freeResult
* PMA_DBI_fetchAssoc
* $GLOBALS['db']
* explode
* count

26
libraries/DisplayResults.class.php
View File

@ -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(
@ -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')
@ -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';
@ -4802,8 +4802,8 @@ 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);
PMA_DBI_dataSeek($dt_result, $this->__get('num_rows') - 1);
$row = PMA_DBI_fetchRow($dt_result);
// check for non printable sorted row data
$meta = $fields_meta[$sorted_column_index];
@ -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,8 +5073,8 @@ 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);
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
// in the multi-edit and multi-delete form
@ -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 .= '<input type="hidden" name="clause_is_unique"'
.' value="' . $clause_is_unique . '" />' . "\n";
@ -5511,13 +5511,13 @@ 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);
if ($dispresult && PMA_DBI_numRows($dispresult) > 0) {
list($dispval) = PMA_DBI_fetchRow($dispresult, 0);
} else {
$dispval = __('Link not found');
}
@PMA_DBI_free_result($dispresult);
@PMA_DBI_freeResult($dispresult);
} else {
$dispval = '';

2
libraries/Error.class.php
View File

@ -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)) {

12
libraries/List_Database.class.php
View File

@ -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;
@ -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
@ -499,13 +499,13 @@ 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)) {
while ($row = PMA_DBI_fetch_assoc($rs)) {
if ($rs && @PMA_DBI_numRows($rs)) {
while ($row = PMA_DBI_fetchAssoc($rs)) {
if (!in_array($row['Db'], $dblist)) {
$dblist[] = $row['Db'];
}
} // end while
PMA_DBI_free_result($rs);
PMA_DBI_freeResult($rs);
} // end if
}
}

2
libraries/RecentTable.class.php
View File

@ -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 {

4
libraries/StorageEngine.class.php
View File

@ -260,7 +260,7 @@ class PMA_StorageEngine
$sql_query = 'SHOW GLOBAL VARIABLES ' . $like . ';';
$res = PMA_DBI_query($sql_query);
while ($row = PMA_DBI_fetch_assoc($res)) {
while ($row = PMA_DBI_fetchAssoc($res)) {
if (isset($variables[$row['Variable_name']])) {
$mysql_vars[$row['Variable_name']] = $variables[$row['Variable_name']];
} elseif (! $like
@ -279,7 +279,7 @@ class PMA_StorageEngine
= PMA_ENGINE_DETAILS_TYPE_PLAINTEXT;
}
}
PMA_DBI_free_result($res);
PMA_DBI_freeResult($res);
return $mysql_vars;
}

22
libraries/Table.class.php
View File

@ -551,8 +551,8 @@ class PMA_Table
PMA_DBI_QUERY_STORE
);
if (!PMA_DBI_getError()) {
$row_count = PMA_DBI_num_rows($result);
PMA_DBI_free_result($result);
$row_count = PMA_DBI_numRows($result);
PMA_DBI_freeResult($result);
}
}
}
@ -659,7 +659,7 @@ class PMA_Table
$table_copy_query, true, PMA_DBI_QUERY_STORE
);
while ($table_copy_row = @PMA_DBI_fetch_assoc($table_copy_rs)) {
while ($table_copy_row = @PMA_DBI_fetchAssoc($table_copy_rs)) {
$value_parts = array();
foreach ($table_copy_row as $_key => $_val) {
if (isset($row_fields[$_key]) && $row_fields[$_key] == 'cc') {
@ -677,10 +677,10 @@ 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_free_result($table_copy_rs);
PMA_DBI_freeResult($table_copy_rs);
return $last_id;
}
@ -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';
@ -969,7 +969,7 @@ class PMA_Table
$comments_copy_rs = PMA_queryAsControlUser($comments_copy_query);
// Write every comment as new copied entry. [MIME]
while ($comments_copy_row = PMA_DBI_fetch_assoc($comments_copy_rs)) {
while ($comments_copy_row = PMA_DBI_fetchAssoc($comments_copy_rs)) {
$new_comment_query = 'REPLACE INTO ' . PMA_Util::backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_Util::backquote($GLOBALS['cfgRelation']['column_info'])
. ' (db_name, table_name, column_name, comment' . ($GLOBALS['cfgRelation']['mimework'] ? ', mimetype, transformation, transformation_options' : '') . ') '
. ' VALUES('
@ -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);
}
@ -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']);
}
@ -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 {

6
libraries/Tracker.class.php
View File

@ -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;
@ -592,7 +592,7 @@ class PMA_Tracker
$sql_query .= " AND `version` = '" . PMA_Util::sqlAddSlashes($version) ."' ".
" ORDER BY `version` DESC LIMIT 1";
$mixed = PMA_DBI_fetch_assoc(PMA_queryAsControlUser($sql_query));
$mixed = PMA_DBI_fetchAssoc(PMA_queryAsControlUser($sql_query));
// Parse log
$log_schema_entries = explode('# log ', $mixed['schema_sql']);

6
libraries/Util.class.php
View File

@ -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
@ -3179,14 +3179,14 @@ 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) {
$srid = $wktarr[1];
$wktval = "'" . $wktval . "'," . $srid;
}
@PMA_DBI_free_result($wktresult);
@PMA_DBI_freeResult($wktresult);
return $wktval;
}

4
libraries/check_user_privileges.lib.php
View File

@ -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(
@ -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

4
libraries/core.lib.php
View File

@ -328,8 +328,8 @@ function PMA_getTableCount($db)
null, PMA_DBI_QUERY_STORE
);
if ($tables) {
$num_tables = PMA_DBI_num_rows($tables);
PMA_DBI_free_result($tables);
$num_tables = PMA_DBI_numRows($tables);
PMA_DBI_freeResult($tables);
} else {
$num_tables = 0;
}

38
libraries/database_interface.lib.php
View File

@ -189,10 +189,10 @@ 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);
$GLOBALS['cached_affected_rows'] = PMA_DBI_affectedRows($link, false);
}
if ($GLOBALS['cfg']['DBG']['sql']) {
@ -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);
}
@ -982,7 +982,7 @@ function PMA_DBI_getDatabasesFull($database = null, $force_stats = false,
. PMA_Util::backquote($database_name) . ';'
);
while ($row = PMA_DBI_fetch_assoc($res)) {
while ($row = PMA_DBI_fetchAssoc($res)) {
$databases[$database_name]['SCHEMA_TABLES']++;
$databases[$database_name]['SCHEMA_TABLE_ROWS']
+= $row['Rows'];
@ -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);
}
}
@ -1599,22 +1599,22 @@ 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;
}
// 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_fetch_assoc';
$fetch_function = 'PMA_DBI_fetchAssoc';
}
// get requested row
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])) {
@ -1651,25 +1651,25 @@ 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;
}
switch ($type) {
case 'NUM' :
$fetch_function = 'PMA_DBI_fetch_row';
$fetch_function = 'PMA_DBI_fetchRow';
break;
case 'ASSOC' :
$fetch_function = 'PMA_DBI_fetch_assoc';
$fetch_function = 'PMA_DBI_fetchAssoc';
break;
case 'BOTH' :
default :
$fetch_function = 'PMA_DBI_fetch_array';
$fetch_function = 'PMA_DBI_fetchArray';
break;
}
$row = $fetch_function($result);
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
return $row;
}
@ -1739,17 +1739,17 @@ function PMA_DBI_fetchResult($result, $key = null, $value = null,
return $resultrows;
}
$fetch_function = 'PMA_DBI_fetch_assoc';
$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_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) {
@ -1806,7 +1806,7 @@ function PMA_DBI_fetchResult($result, $key = null, $value = null,
}
}
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
return $resultrows;
}

2
libraries/db_common.inc.php
View File

@ -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

18
libraries/db_info.inc.php
View File

@ -71,29 +71,29 @@ 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)) {
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])) {
$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(
'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) {
while ($tmp = PMA_DBI_fetch_row($db_info_result)) {
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(
'SHOW TABLE STATUS FROM ' . PMA_Util::backquote($db)
. ' LIKE \'' . PMA_Util::sqlAddSlashes($tmp[0], true) . '\';'
);
$sts_tmp = PMA_DBI_fetch_assoc($sts_result);
PMA_DBI_free_result($sts_result);
$sts_tmp = PMA_DBI_fetchAssoc($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);
}
}

10
libraries/db_table_exists.lib.php
View File

@ -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;
}
@ -63,8 +63,8 @@ if (empty($is_table)
. '\';',
null, PMA_DBI_QUERY_STORE
);
$is_table = @PMA_DBI_num_rows($_result);
PMA_DBI_free_result($_result);
$is_table = @PMA_DBI_numRows($_result);
PMA_DBI_freeResult($_result);
}
} else {
$is_table = false;
@ -86,8 +86,8 @@ if (empty($is_table)
null,
PMA_DBI_QUERY_STORE
);
$is_table = ($_result && @PMA_DBI_num_rows($_result));
PMA_DBI_free_result($_result);
$is_table = ($_result && @PMA_DBI_numRows($_result));
PMA_DBI_freeResult($_result);
}
if (! $is_table) {

54
libraries/dbi/drizzle.dbi.lib.php
View File

@ -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
);
@ -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'])) {
@ -186,7 +186,7 @@ function PMA_DBI_select_db($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
@ -202,7 +202,7 @@ function PMA_DBI_real_query($query, $link, $options)
*
* @return array
*/
function PMA_DBI_fetch_array($result)
function PMA_DBI_fetchArray($result)
{
return $result->fetchRow(PMA_Drizzle::FETCH_BOTH);
}
@ -214,7 +214,7 @@ function PMA_DBI_fetch_array($result)
*
* @return array
*/
function PMA_DBI_fetch_assoc($result)
function PMA_DBI_fetchAssoc($result)
{
return $result->fetchRow(PMA_Drizzle::FETCH_ASSOC);
}
@ -226,7 +226,7 @@ function PMA_DBI_fetch_assoc($result)
*
* @return array
*/
function PMA_DBI_fetch_row($result)
function PMA_DBI_fetchRow($result)
{
return $result->fetchRow(PMA_Drizzle::FETCH_NUM);
}
@ -239,7 +239,7 @@ function PMA_DBI_fetch_row($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);
}
@ -251,7 +251,7 @@ function PMA_DBI_data_seek($result, $offset)
*
* @return void
*/
function PMA_DBI_free_result($result)
function PMA_DBI_freeResult($result)
{
if ($result instanceof PMA_DrizzleResult) {
$result->free();
@ -263,7 +263,7 @@ function PMA_DBI_free_result($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
@ -277,7 +277,7 @@ function PMA_DBI_more_results()
*
* @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
@ -293,7 +293,7 @@ function PMA_DBI_next_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'])) {
@ -316,7 +316,7 @@ function PMA_DBI_get_host_info($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'])) {
@ -334,7 +334,7 @@ function PMA_DBI_get_proto_info($link = null)
*
* @return string Drizzle client library version
*/
function PMA_DBI_get_client_info()
function PMA_DBI_getClientInfo()
{
return 'libdrizzle (Drizzle ' . drizzle_version() . ')';
}
@ -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)) {
@ -404,7 +404,7 @@ function PMA_DBI_num_rows($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.
}
@ -433,7 +433,7 @@ function PMA_DBI_insert_id($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'])) {
@ -456,7 +456,7 @@ function PMA_DBI_affected_rows($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();
@ -523,7 +523,7 @@ function PMA_DBI_get_fields_meta($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);
@ -548,7 +548,7 @@ function PMA_DBI_get_fields_meta($result)
*
* @return int field count
*/
function PMA_DBI_num_fields($result)
function PMA_DBI_numFields($result)
{
return $result->numColumns();
}
@ -561,7 +561,7 @@ function PMA_DBI_num_fields($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();
@ -575,7 +575,7 @@ function PMA_DBI_field_len($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();
@ -589,7 +589,7 @@ function PMA_DBI_field_name($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];
@ -659,7 +659,7 @@ function PMA_DBI_field_flags($result, $i)
*
* @return false
*/
function PMA_DBI_store_result()
function PMA_DBI_storeResult()
{
return false;
}

34
libraries/dbi/dummy.lib.php
View File

@ -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;
}
@ -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;
@ -317,7 +317,7 @@ function PMA_DBI_select_db($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++) {
@ -341,7 +341,7 @@ function PMA_DBI_real_query($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'])) {
@ -359,9 +359,9 @@ 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);
$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;
@ -378,9 +378,9 @@ function PMA_DBI_fetch_array($result)
*
* @return array
*/
function PMA_DBI_fetch_assoc($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) {
@ -398,9 +398,9 @@ function PMA_DBI_fetch_assoc($result)
*
* @return array
*/
function PMA_DBI_fetch_row($result)
function PMA_DBI_fetchRow($result)
{
$data = PMA_DBI_fetch_any($result);
$data = PMA_DBI_fetchAny($result);
return $data;
}
@ -412,7 +412,7 @@ function PMA_DBI_fetch_row($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;
@ -428,7 +428,7 @@ function PMA_DBI_data_seek($result, $offset)
*
* @return void
*/
function PMA_DBI_free_result($result)
function PMA_DBI_freeResult($result)
{
return;
}
@ -438,7 +438,7 @@ function PMA_DBI_free_result($result)
*
* @return bool false
*/
function PMA_DBI_more_results()
function PMA_DBI_moreResults()
{
return false;
}
@ -448,7 +448,7 @@ function PMA_DBI_more_results()
*
* @return boo false
*/
function PMA_DBI_next_result()
function PMA_DBI_nextResult()
{
return false;
}
@ -460,7 +460,7 @@ function PMA_DBI_next_result()
*
* @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']);
@ -477,7 +477,7 @@ function PMA_DBI_num_rows($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;
}
@ -489,7 +489,7 @@ function PMA_DBI_affected_rows($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']);

54
libraries/dbi/mysql.dbi.lib.php
View File

@ -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;
@ -69,7 +69,7 @@ function PMA_DBI_real_connect($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
@ -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
);
@ -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'])) {
@ -209,7 +209,7 @@ function PMA_DBI_select_db($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);
@ -227,7 +227,7 @@ function PMA_DBI_real_query($query, $link, $options)
*
* @return array
*/
function PMA_DBI_fetch_array($result)
function PMA_DBI_fetchArray($result)
{
return mysql_fetch_array($result, MYSQL_BOTH);
}
@ -239,7 +239,7 @@ function PMA_DBI_fetch_array($result)
*
* @return array
*/
function PMA_DBI_fetch_assoc($result)
function PMA_DBI_fetchAssoc($result)
{
return mysql_fetch_array($result, MYSQL_ASSOC);
}
@ -251,7 +251,7 @@ function PMA_DBI_fetch_assoc($result)
*
* @return array
*/
function PMA_DBI_fetch_row($result)
function PMA_DBI_fetchRow($result)
{
return mysql_fetch_array($result, MYSQL_NUM);
}
@ -264,7 +264,7 @@ function PMA_DBI_fetch_row($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);
}
@ -276,7 +276,7 @@ function PMA_DBI_data_seek($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);
@ -288,7 +288,7 @@ function PMA_DBI_free_result($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
@ -302,7 +302,7 @@ function PMA_DBI_more_results()
*
* @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
@ -318,7 +318,7 @@ function PMA_DBI_next_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'])) {
@ -337,7 +337,7 @@ function PMA_DBI_get_host_info($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'])) {
@ -354,7 +354,7 @@ function PMA_DBI_get_proto_info($link = null)
*
* @return string MySQL client library version
*/
function PMA_DBI_get_client_info()
function PMA_DBI_getClientInfo()
{
return mysql_get_client_info();
}
@ -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);
@ -424,7 +424,7 @@ function PMA_DBI_num_rows($result)
*
* @return string|int
*/
function PMA_DBI_insert_id($link = null)
function PMA_DBI_insertId($link = null)
{
if (empty($link)) {
if (isset($GLOBALS['userlink'])) {
@ -449,7 +449,7 @@ function PMA_DBI_insert_id($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'])) {
@ -475,7 +475,7 @@ function PMA_DBI_affected_rows($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);
@ -496,7 +496,7 @@ function PMA_DBI_get_fields_meta($result)
*
* @return int field count
*/
function PMA_DBI_num_fields($result)
function PMA_DBI_numFields($result)
{
return mysql_num_fields($result);
}
@ -509,7 +509,7 @@ function PMA_DBI_num_fields($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);
}
@ -522,7 +522,7 @@ function PMA_DBI_field_len($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);
}
@ -535,7 +535,7 @@ function PMA_DBI_field_name($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);
}
@ -545,7 +545,7 @@ function PMA_DBI_field_flags($result, $i)
*
* @return false
*/
function PMA_DBI_store_result()
function PMA_DBI_storeResult()
{
return false;
}

56
libraries/dbi/mysqli.dbi.lib.php
View File

@ -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,
@ -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'])) {
@ -254,7 +254,7 @@ function PMA_DBI_select_db($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;
@ -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);
}
@ -287,7 +287,7 @@ function PMA_DBI_real_multi_query($link, $query)
*
* @return array
*/
function PMA_DBI_fetch_array($result)
function PMA_DBI_fetchArray($result)
{
return mysqli_fetch_array($result, MYSQLI_BOTH);
}
@ -299,7 +299,7 @@ function PMA_DBI_fetch_array($result)
*
* @return array
*/
function PMA_DBI_fetch_assoc($result)
function PMA_DBI_fetchAssoc($result)
{
return mysqli_fetch_array($result, MYSQLI_ASSOC);
}
@ -311,7 +311,7 @@ function PMA_DBI_fetch_assoc($result)
*
* @return array
*/
function PMA_DBI_fetch_row($result)
function PMA_DBI_fetchRow($result)
{
return mysqli_fetch_array($result, MYSQLI_NUM);
}
@ -324,7 +324,7 @@ function PMA_DBI_fetch_row($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);
}
@ -336,7 +336,7 @@ function PMA_DBI_data_seek($result, $offset)
*
* @return void
*/
function PMA_DBI_free_result($result)
function PMA_DBI_freeResult($result)
{
if ($result instanceof mysqli_result) {
mysqli_free_result($result);
@ -350,7 +350,7 @@ function PMA_DBI_free_result($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'])) {
@ -369,7 +369,7 @@ function PMA_DBI_more_results($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'])) {
@ -386,7 +386,7 @@ function PMA_DBI_next_result($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'])) {
@ -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'])) {
@ -424,7 +424,7 @@ function PMA_DBI_get_host_info($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'])) {
@ -441,7 +441,7 @@ function PMA_DBI_get_proto_info($link = null)
*
* @return string MySQL client library version
*/
function PMA_DBI_get_client_info()
function PMA_DBI_getClientInfo()
{
return mysqli_get_client_info();
}
@ -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)) {
@ -509,7 +509,7 @@ function PMA_DBI_num_rows($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.
}
@ -535,7 +535,7 @@ function PMA_DBI_insert_id($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'])) {
@ -558,7 +558,7 @@ function PMA_DBI_affected_rows($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();
@ -607,7 +607,7 @@ function PMA_DBI_get_fields_meta($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);
@ -639,7 +639,7 @@ function PMA_DBI_get_fields_meta($result)
*
* @return int field count
*/
function PMA_DBI_num_fields($result)
function PMA_DBI_numFields($result)
{
return mysqli_num_fields($result);
}
@ -652,7 +652,7 @@ function PMA_DBI_num_fields($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;
}
@ -665,7 +665,7 @@ function PMA_DBI_field_len($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;
}
@ -678,7 +678,7 @@ function PMA_DBI_field_name($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')) {

4
libraries/import.lib.php
View File

@ -175,8 +175,8 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false,
return;
}
} else {
$a_num_rows = (int)@PMA_DBI_num_rows($result);
$a_aff_rows = (int)@PMA_DBI_affected_rows();
$a_num_rows = (int)@PMA_DBI_numRows($result);
$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'];

20
libraries/insert_edit.lib.php
View File

@ -83,7 +83,7 @@ function PMA_analyzeWhereClauses(
. PMA_Util::backquote($table)
. ' WHERE ' . $where_clause . ';';
$result[$key_id] = PMA_DBI_query($local_query, null, PMA_DBI_QUERY_STORE);
$rows[$key_id] = PMA_DBI_fetch_assoc($result[$key_id]);
$rows[$key_id] = PMA_DBI_fetchAssoc($result[$key_id]);
$where_clauses[$key_id] = str_replace('\\', '\\\\', $where_clause);
$has_unique_condition = PMA_showEmptyResultMessageOrSetUniqueCondition(
@ -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(
@ -1787,8 +1787,8 @@ 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);
$meta = PMA_DBI_get_fields_meta($res);
$row = PMA_DBI_fetchRow($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)
@ -1921,12 +1921,12 @@ 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);
$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
@ -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();
}
@ -1994,10 +1994,10 @@ 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) {
list($dispval) = PMA_DBI_fetch_row($dispresult, 0);
if ($dispresult && PMA_DBI_numRows($dispresult) > 0) {
list($dispval) = PMA_DBI_fetchRow($dispresult, 0);
}
@PMA_DBI_free_result($dispresult);
@PMA_DBI_freeResult($dispresult);
return $dispval;
}
return '';

16
libraries/mult_submits.inc.php
View File

@ -86,16 +86,16 @@ 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)) {
while ($row = PMA_DBI_fetchAssoc($result)) {
// Backups the list of primary keys
if ($row['Key_name'] == 'PRIMARY') {
$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);
@ -365,16 +365,16 @@ 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)) {
while ($row = PMA_DBI_fetchAssoc($result)) {
// Backups the list of primary keys
if ($row['Key_name'] == 'PRIMARY') {
$primary .= $row['Column_name'] . ', ';
}
} // end while
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
}
$rebuild_database_list = false;
@ -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;');

12
libraries/mysql_charsets.lib.php
View File

@ -22,14 +22,14 @@ if (! PMA_Util::cacheExists('mysql_charsets', true)) {
$res = PMA_DBI_query($sql);
$mysql_charsets = array();
while ($row = PMA_DBI_fetch_assoc($res)) {
while ($row = PMA_DBI_fetchAssoc($res)) {
$mysql_charsets[] = $row['CHARACTER_SET_NAME'];
// never used
//$mysql_charsets_maxlen[$row['Charset']] = $row['Maxlen'];
$mysql_charsets_descriptions[$row['CHARACTER_SET_NAME']]
= $row['DESCRIPTION'];
}
PMA_DBI_free_result($res);
PMA_DBI_freeResult($res);
sort($mysql_charsets, SORT_STRING);
@ -41,7 +41,7 @@ if (! PMA_Util::cacheExists('mysql_charsets', true)) {
? 'SELECT * FROM data_dictionary.COLLATIONS'
: 'SELECT * FROM information_schema.COLLATIONS';
$res = PMA_DBI_query($sql);
while ($row = PMA_DBI_fetch_assoc($res)) {
while ($row = PMA_DBI_fetchAssoc($res)) {
if (! is_array($mysql_collations[$row['CHARACTER_SET_NAME']])) {
$mysql_collations[$row['CHARACTER_SET_NAME']]
= array($row['COLLATION_NAME']);
@ -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
@ -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;
}

2
libraries/navigation/Nodes/Node.class.php
View File

@ -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;
}

20
libraries/navigation/Nodes/Node_Database.class.php
View File

@ -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:
@ -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++;

14
libraries/navigation/Nodes/Node_Table.class.php
View File

@ -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:
@ -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++;
@ -219,7 +219,7 @@ class Node_Table extends Node
$db = PMA_Util::backquote($db);
$query = "SHOW TABLE STATUS FROM $db ";
$query .= "WHERE Name = '$table'";
$arr = PMA_DBI_fetch_assoc(PMA_DBI_tryQuery($query));
$arr = PMA_DBI_fetchAssoc(PMA_DBI_tryQuery($query));
$retval = $arr['Comment'];
}
return $retval;

18
libraries/operations.lib.php
View File

@ -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

8
libraries/plugins/export/ExportCodegen.class.php
View File

@ -252,10 +252,10 @@ 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);
PMA_DBI_freeResult($result);
$lines[] = 'using System;';
$lines[] = 'using System.Collections;';
$lines[] = 'using System.Collections.Generic;';
@ -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(
@ -365,7 +365,7 @@ class ExportCodegen extends ExportPlugin
);
}
}
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
}
$lines[] = ' </class>';
$lines[] = '</hibernate-mapping>';

10
libraries/plugins/export/ExportCsv.class.php
View File

@ -247,20 +247,20 @@ 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'])) {
$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;
}
@ -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])) {
@ -336,7 +336,7 @@ class ExportCsv extends ExportPlugin
return false;
}
} // end while
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
return true;
}

10
libraries/plugins/export/ExportHtmlword.class.php
View File

@ -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'])) {
@ -221,7 +221,7 @@ class ExportHtmlword extends ExportPlugin
for ($i = 0; $i < $fields_cnt; $i++) {
$schema_insert .= '<td class="print"><strong>'
. htmlspecialchars(
stripslashes(PMA_DBI_field_name($result, $i))
stripslashes(PMA_DBI_fieldName($result, $i))
)
. '</strong></td>';
} // end for
@ -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 = '<tr class="print-category">';
for ($j = 0; $j < $fields_cnt; $j++) {
if (! isset($row[$j]) || is_null($row[$j])) {
@ -251,7 +251,7 @@ class ExportHtmlword extends ExportPlugin
return false;
}
} // end while
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
if (! PMA_exportOutputHandler('</table>')) {
return false;
}
@ -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'])) {

10
libraries/plugins/export/ExportJson.class.php
View File

@ -159,19 +159,19 @@ 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_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));
$columns[$i] = stripslashes(PMA_DBI_fieldName($result, $i));
}
unset($i);
$buffer = '';
$record_cnt = 0;
while ($record = PMA_DBI_fetch_row($result)) {
while ($record = PMA_DBI_fetchRow($result)) {
$record_cnt++;
@ -214,7 +214,7 @@ class ExportJson extends ExportPlugin
return false;
}
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
return true;
}
}

10
libraries/plugins/export/ExportLatex.class.php
View File

@ -292,9 +292,9 @@ 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);
$columns[$i] = PMA_DBI_fieldName($result, $i);
}
unset($i);
@ -370,7 +370,7 @@ class ExportLatex extends ExportPlugin
}
// print the whole table
while ($record = PMA_DBI_fetch_assoc($result)) {
while ($record = PMA_DBI_fetchAssoc($result)) {
$buffer = '';
// print each row
for ($i = 0; $i < $columns_cnt; $i++) {
@ -403,7 +403,7 @@ class ExportLatex extends ExportPlugin
return false;
}
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
return true;
} // end getTableLaTeX
@ -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'])) {

4
libraries/plugins/export/ExportMediawiki.class.php
View File

@ -316,9 +316,9 @@ 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_fetch_row($result)) {
while ($row = PMA_DBI_fetchRow($result)) {
$output .= "|-" . $this->_exportCRLF();
// Use '|' for separating table columns

12
libraries/plugins/export/ExportOds.class.php
View File

@ -227,11 +227,11 @@ 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_cnt = PMA_DBI_numFields($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);
$field_flags[$j] = PMA_DBI_fieldFlags($result, $j);
}
$GLOBALS['ods_buffer'] .=
@ -245,7 +245,7 @@ class ExportOds extends ExportPlugin
'<table:table-cell office:value-type="string">'
. '<text:p>'
. htmlspecialchars(
stripslashes(PMA_DBI_field_name($result, $i))
stripslashes(PMA_DBI_fieldName($result, $i))
)
. '</text:p>'
. '</table:table-cell>';
@ -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'] .= '<table:table-row>';
for ($j = 0; $j < $fields_cnt; $j++) {
if (! isset($row[$j]) || is_null($row[$j])) {
@ -324,7 +324,7 @@ class ExportOds extends ExportPlugin
} // end for
$GLOBALS['ods_buffer'] .= '</table:table-row>';
} // end while
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
$GLOBALS['ods_buffer'] .= '</table:table>';

16
libraries/plugins/export/ExportOdt.class.php
View File

@ -245,11 +245,11 @@ 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_cnt = PMA_DBI_numFields($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);
$field_flags[$j] = PMA_DBI_fieldFlags($result, $j);
}
$GLOBALS['odt_buffer'] .=
@ -270,7 +270,7 @@ class ExportOdt extends ExportPlugin
'<table:table-cell office:value-type="string">'
. '<text:p>'
. htmlspecialchars(
stripslashes(PMA_DBI_field_name($result, $i))
stripslashes(PMA_DBI_fieldName($result, $i))
)
. '</text:p>'
. '</table:table-cell>';
@ -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'] .= '<table:table-row>';
for ($j = 0; $j < $fields_cnt; $j++) {
if (! isset($row[$j]) || is_null($row[$j])) {
@ -319,7 +319,7 @@ class ExportOdt extends ExportPlugin
} // end for
$GLOBALS['odt_buffer'] .= '</table:table-row>';
} // end while
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
$GLOBALS['odt_buffer'] .= '</table:table>';
@ -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'])) {

8
libraries/plugins/export/ExportPhparray.class.php
View File

@ -165,9 +165,9 @@ 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));
$columns[$i] = stripslashes(PMA_DBI_fieldName($result, $i));
}
unset($i);
@ -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
@ -219,7 +219,7 @@ class ExportPhparray extends ExportPlugin
return false;
}
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
return true;
}
}

22
libraries/plugins/export/ExportSql.class.php
View File

@ -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,8 +911,8 @@ class ExportSql extends ExportPlugin
PMA_DBI_QUERY_STORE
);
if ($result != false) {
if (PMA_DBI_num_rows($result) > 0) {
$tmpres = PMA_DBI_fetch_assoc($result);
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
// SHOW TABLE STATUS, add it
@ -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;
@ -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);
@ -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
@ -1569,13 +1569,13 @@ 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_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);
$field_flags[$j] = PMA_DBI_fieldFlags($result, $j);
}
for ($j = 0; $j < $fields_cnt; $j++) {
@ -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()
@ -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

12
libraries/plugins/export/ExportTexytext.class.php
View File

@ -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'])) {
@ -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";
@ -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])) {
@ -227,7 +227,7 @@ class ExportTexytext extends ExportPlugin
return false;
}
} // end while
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
return true;
}
@ -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'])) {

8
libraries/plugins/export/ExportXml.class.php
View File

@ -447,10 +447,10 @@ 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));
$columns[$i] = stripslashes(PMA_DBI_fieldName($result, $i));
}
unset($i);
@ -459,7 +459,7 @@ class ExportXml extends ExportPlugin
return false;
}
while ($record = PMA_DBI_fetch_row($result)) {
while ($record = PMA_DBI_fetchRow($result)) {
$buffer = ' <table name="'
. htmlspecialchars($table) . '">' . $crlf;
for ($i = 0; $i < $columns_cnt; $i++) {
@ -479,7 +479,7 @@ class ExportXml extends ExportPlugin
return false;
}
}
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
}
return true;

8
libraries/plugins/export/ExportYaml.class.php
View File

@ -158,15 +158,15 @@ 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));
$columns[$i] = stripslashes(PMA_DBI_fieldName($result, $i));
}
unset($i);
$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
@ -206,7 +206,7 @@ class ExportYaml extends ExportPlugin
return false;
}
}
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
return true;
} // end getTableYAML

12
libraries/plugins/export/PMA_ExportPdf.class.php
View File

@ -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);
@ -278,8 +278,8 @@ 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->fields = PMA_DBI_get_fields_meta($this->results);
$this->numFields = PMA_DBI_numFields($this->results);
$this->fields = PMA_DBI_getFieldsMeta($this->results);
// sColWidth = starting col width (an average size width)
$availableWidth = $this->w - $this->lMargin - $this->rMargin;
@ -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)) {
@ -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

6
libraries/plugins/import/ImportLdi.class.php
View File

@ -47,13 +47,13 @@ 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) {
$tmp = PMA_DBI_fetch_row($result);
if ($result != false && PMA_DBI_numRows($result) > 0) {
$tmp = PMA_DBI_fetchRow($result);
if ($tmp[1] == 'ON') {
$GLOBALS['cfg']['Import']['ldi_local_option'] = true;
}
}
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
unset($result);
}

10
libraries/pmd_common.php
View File

@ -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(
@ -88,7 +88,7 @@ function get_columns_info()
);
$tbl_name_i = $GLOBALS['PMD']['TABLE_NAME'][$i];
$j = 0;
while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
while ($row = PMA_DBI_fetchAssoc($fields_rs)) {
$tab_column[$tbl_name_i]['COLUMN_ID'][$j] = $j;
$tab_column[$tbl_name_i]['COLUMN_NAME'][$j] = $row['Field'];
$tab_column[$tbl_name_i]['TYPE'][$j] = $row['Type'];
@ -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(
@ -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 "<br> internal ".$GLOBALS['db']." - ".$val[0]." - ";
//print_r($row);

30
libraries/relation.lib.php
View File

@ -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,
@ -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']) {
@ -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;
@ -704,11 +704,11 @@ 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) {
$row = PMA_DBI_fetch_assoc($com_rs);
if ($com_rs && PMA_DBI_numRows($com_rs) > 0) {
$row = PMA_DBI_fetchAssoc($com_rs);
$comment = $row['comment'];
}
PMA_DBI_free_result($com_rs);
PMA_DBI_freeResult($com_rs);
}
return $comment;
@ -735,12 +735,12 @@ 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) {
while ($row = PMA_DBI_fetch_assoc($com_rs)) {
if ($com_rs && PMA_DBI_numRows($com_rs) > 0) {
while ($row = PMA_DBI_fetchAssoc($com_rs)) {
$comments[$row['db_name']] = $row['comment'];
}
}
PMA_DBI_free_result($com_rs);
PMA_DBI_freeResult($com_rs);
}
return $comments;
@ -1128,23 +1128,23 @@ 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;
}
}
$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
// not be expected.
$disp_row = array();
while ($single_disp_row = @PMA_DBI_fetch_assoc($disp)) {
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;
@ -1199,7 +1199,7 @@ function PMA_getRelatives($all_tables, $master)
. ' AND ' . $from . '_table IN ' . $in_know
. ' AND ' . $to . '_table IN ' . $in_left;
$relations = @PMA_DBI_query($rel_query, $GLOBALS['controllink']);
while ($row = PMA_DBI_fetch_assoc($relations)) {
while ($row = PMA_DBI_fetchAssoc($relations)) {
$found_table = $row[$to . '_table'];
if (isset($remaining_tables[$found_table])) {
$fromclause
@ -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'] : ''
);
}

2
libraries/replication.inc.php
View File

@ -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;
}

2
libraries/rte/rte_main.inc.php
View File

@ -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);
}

14
libraries/rte/rte_routines.lib.php
View File

@ -1373,13 +1373,13 @@ function PMA_RTN_handleExecute()
do {
$result = PMA_DBI_store_result();
$num_rows = PMA_DBI_num_rows($result);
$result = PMA_DBI_storeResult();
$num_rows = PMA_DBI_numRows($result);
if (($result !== false) && ($num_rows > 0)) {
$output .= "<table><tr>";
foreach (PMA_DBI_get_fields_meta($result) as $key => $field) {
foreach (PMA_DBI_getFieldsMeta($result) as $key => $field) {
$output .= "<th>";
$output .= htmlspecialchars($field->name);
$output .= "</th>";
@ -1388,7 +1388,7 @@ function PMA_RTN_handleExecute()
$color_class = 'odd';
while ($row = PMA_DBI_fetch_assoc($result)) {
while ($row = PMA_DBI_fetchAssoc($result)) {
$output .= "<tr>";
foreach ($row as $key => $value) {
if ($value === null) {
@ -1409,15 +1409,15 @@ function PMA_RTN_handleExecute()
}
if (! PMA_DBI_more_results()) {
if (! PMA_DBI_moreResults()) {
break;
}
$output .= "<br/>";
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
} while (PMA_DBI_next_result());
} while (PMA_DBI_nextResult());
$output .= "</fieldset>";

12
libraries/schema/Dia_Relation_Schema.class.php
View File

@ -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)
@ -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];
}
}
@ -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",
@ -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;
/*
@ -289,8 +289,8 @@ class Table_Stats
null,
PMA_DBI_QUERY_STORE
);
if (PMA_DBI_num_rows($result) > 0) {
while ($row = PMA_DBI_fetch_assoc($result)) {
if (PMA_DBI_numRows($result) > 0) {
while ($row = PMA_DBI_fetchAssoc($result)) {
if ($row['Key_name'] == 'PRIMARY') {
$this->primary[] = $row['Column_name'];
}

12
libraries/schema/Eps_Relation_Schema.class.php
View File

@ -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)
@ -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];
}
}
@ -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(
@ -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
@ -486,8 +486,8 @@ class Table_Stats
'SHOW INDEX FROM ' . PMA_Util::backquote($tableName) . ';',
null, PMA_DBI_QUERY_STORE
);
if (PMA_DBI_num_rows($result) > 0) {
while ($row = PMA_DBI_fetch_assoc($result)) {
if (PMA_DBI_numRows($result) > 0) {
while ($row = PMA_DBI_fetchAssoc($result)) {
if ($row['Key_name'] == 'PRIMARY') {
$this->primary[] = $row['Column_name'];
}

4
libraries/schema/Export_Relation_Schema.class.php
View File

@ -200,10 +200,10 @@ 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_fetch_assoc($tab_rs)) {
while ($curr_table = @PMA_DBI_fetchAssoc($tab_rs)) {
$alltables[] = PMA_Util::sqlAddSlashes($curr_table['table_name']);
}
return $alltables;

20
libraries/schema/Pdf_Relation_Schema.class.php
View File

@ -215,7 +215,7 @@ class PMA_Schema_PDF extends PMA_PDF
. ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($db) . '\''
. ' AND page_nr = \'' . $pdf_page_number . '\'';
$test_rs = PMA_queryAsControlUser($test_query);
$pages = @PMA_DBI_fetch_assoc($test_rs);
$pages = @PMA_DBI_fetchAssoc($test_rs);
$this->SetFont($this->_ff, 'B', 14);
$this->Cell(0, 6, ucfirst($pages['page_descr']), 'B', 1, 'C');
$this->SetFont($this->_ff, '');
@ -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
@ -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];
}
}
@ -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'),
@ -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;
/*
@ -466,8 +466,8 @@ class Table_Stats
'SHOW INDEX FROM ' . PMA_Util::backquote($tableName) . ';',
null, PMA_DBI_QUERY_STORE
);
if (PMA_DBI_num_rows($result) > 0) {
while ($row = PMA_DBI_fetch_assoc($result)) {
if (PMA_DBI_numRows($result) > 0) {
while ($row = PMA_DBI_fetchAssoc($result)) {
if ($row['Key_name'] == 'PRIMARY') {
$this->primary[] = $row['Column_name'];
}
@ -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)) {
@ -1271,7 +1271,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
$indexes_data = array();
$pk_array = 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)) {
// Backups the list of primary keys
if ($row['Key_name'] == 'PRIMARY') {
$primary .= $row['Column_name'] . ', ';
@ -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);
}
/**

12
libraries/schema/Svg_Relation_Schema.class.php
View File

@ -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",
@ -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];
}
}
@ -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",
@ -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
@ -456,8 +456,8 @@ class Table_Stats
null,
PMA_DBI_QUERY_STORE
);
if (PMA_DBI_num_rows($result) > 0) {
while ($row = PMA_DBI_fetch_assoc($result)) {
if (PMA_DBI_numRows($result) > 0) {
while ($row = PMA_DBI_fetchAssoc($result)) {
if ($row['Key_name'] == 'PRIMARY') {
$this->primary[] = $row['Column_name'];
}

20
libraries/schema/User_Schema.class.php
View File

@ -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) {
?>
<form method="get" action="schema_edit.php" name="frm_select_page">
<fieldset>
@ -197,7 +197,7 @@ class PMA_User_Schema
<select name="chpage" id="chpage" class="autosubmit">
<option value="0"><?php echo __('Select page'); ?></option>
<?php
while ($curr_page = PMA_DBI_fetch_assoc($page_rs)) {
while ($curr_page = PMA_DBI_fetchAssoc($page_rs)) {
echo "\n" . ' '
. '<option value="' . $curr_page['page_nr'] . '"';
if (isset($this->chosenPage)
@ -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];
}
@ -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,11 +427,11 @@ class PMA_User_Schema
<label for="pdf_page_number_opt"><?php echo __('Page number:'); ?></label>
<select name="pdf_page_number" id="pdf_page_number_opt">
<?php
while ($pages = @PMA_DBI_fetch_assoc($test_rs)) {
while ($pages = @PMA_DBI_fetchAssoc($test_rs)) {
echo ' <option value="' . $pages['page_nr'] . '">'
. $pages['page_nr'] . ': ' . htmlspecialchars($pages['page_descr']) . '</option>' . "\n";
} // end while
PMA_DBI_free_result($test_rs);
PMA_DBI_freeResult($test_rs);
unset($test_rs);
?>
</select><br />
@ -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";
@ -747,12 +747,12 @@ 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
*/
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;
}
@ -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'])

12
libraries/schema/Visio_Relation_Schema.class.php
View File

@ -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",
@ -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];
}
}
@ -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",
@ -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
@ -295,8 +295,8 @@ class Table_Stats
'SHOW INDEX FROM ' . PMA_Util::backquote($tableName) . ';', null,
PMA_DBI_QUERY_STORE
);
if (PMA_DBI_num_rows($result) > 0) {
while ($row = PMA_DBI_fetch_assoc($result)) {
if (PMA_DBI_numRows($result) > 0) {
while ($row = PMA_DBI_fetchAssoc($result)) {
if ($row['Key_name'] == 'PRIMARY') {
$this->primary[] = $row['Column_name'];
}

2
libraries/server_common.inc.php
View File

@ -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);
}
/**

56
libraries/server_privileges.lib.php
View File

@ -398,14 +398,14 @@ 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 {
$row[$row1[0]] = 'N';
}
}
PMA_DBI_free_result($res);
PMA_DBI_freeResult($res);
} else {
$row = array('Table_priv' => '');
}
@ -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,
@ -455,7 +455,7 @@ function PMA_getHtmlToDisplayPrivilegesTable($db = '*',
'References' => false
);
}
PMA_DBI_free_result($res);
PMA_DBI_freeResult($res);
}
unset($res, $row1);
}
@ -584,13 +584,13 @@ 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;
}
}
PMA_DBI_free_result($res);
PMA_DBI_freeResult($res);
unset($res, $row1, $current);
$html_output = '<input type="hidden" name="grant_count" '
@ -1595,7 +1595,7 @@ function PMA_getHtmlForSpecificDbPrivileges($link_edit, $conditional_class)
.' `Host` ASC,'
.' `Db` ASC;';
$res = PMA_DBI_query($sql_query);
$row = PMA_DBI_fetch_assoc($res);
$row = PMA_DBI_fetchAssoc($res);
if ($row) {
$found = true;
}
@ -1660,7 +1660,7 @@ function PMA_getHtmlTableBodyForSpecificDbPrivs($found, $row, $odd_row,
&& $current_host == $row['Host']
) {
$current_privileges[] = $row;
$row = PMA_DBI_fetch_assoc($res);
$row = PMA_DBI_fetchAssoc($res);
}
$html_output .= '<tr '
. 'class="noclick ' . ($odd_row ? 'odd' : 'even')
@ -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 {
@ -2061,7 +2061,7 @@ function PMA_getUserSpecificRights($tables, $user_host_condition, $dbname)
$db_rights_result = PMA_DBI_query($db_rights_sql);
while ($db_rights_row = PMA_DBI_fetch_assoc($db_rights_result)) {
while ($db_rights_row = PMA_DBI_fetchAssoc($db_rights_result)) {
$db_rights_row = array_merge($user_defaults, $db_rights_row);
if (! strlen($dbname)) {
// only Db names in the table `mysql`.`db` uses wildcards
@ -2074,7 +2074,7 @@ function PMA_getUserSpecificRights($tables, $user_host_condition, $dbname)
$db_rights[$db_rights_row[$dbOrTableName]] = $db_rights_row;
}
PMA_DBI_free_result($db_rights_result);
PMA_DBI_freeResult($db_rights_result);
if (! strlen($dbname)) {
$sql_query = 'SELECT * FROM `mysql`.`db`'
@ -2092,7 +2092,7 @@ function PMA_getUserSpecificRights($tables, $user_host_condition, $dbname)
$result = PMA_DBI_query($sql_query);
$sql_query = '';
while ($row = PMA_DBI_fetch_assoc($result)) {
while ($row = PMA_DBI_fetchAssoc($result)) {
if (isset($db_rights[$row[$dbOrTableName]])) {
$db_rights[$row[$dbOrTableName]]
= array_merge($db_rights[$row[$dbOrTableName]], $row);
@ -2105,7 +2105,7 @@ function PMA_getUserSpecificRights($tables, $user_host_condition, $dbname)
$db_rights[$row['Db']]['can_delete'] = true;
}
}
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
return $db_rights;
}
@ -2133,7 +2133,7 @@ function PMA_getHtmlForDisplayUserRightsInRows($db_rights, $link_edit, $dbname,
. '</tr>' . "\n";
} else {
$odd_row = true;
//while ($row = PMA_DBI_fetch_assoc($res)) {
//while ($row = PMA_DBI_fetchAssoc($res)) {
foreach ($db_rights as $row) {
$found_rows[] = (! strlen($dbname)) ? $row['Db'] : $row['Table_name'];
@ -2335,12 +2335,12 @@ 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];
}
}
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
if (! empty($pred_tbl_array)) {
$html_output .= '<select name="pred_tablename" '
@ -2379,11 +2379,11 @@ function PMA_displayTablesInEditPrivs($dbname, $found_rows)
function PMA_getUsersOverview($result, $db_rights, $link_edit, $pmaThemeImage,
$text_dir, $conditional_class, $link_export
) {
while ($row = PMA_DBI_fetch_assoc($result)) {
while ($row = PMA_DBI_fetchAssoc($result)) {
$row['privs'] = PMA_extractPrivInfo($row, true);
$db_rights[$row['User']][$row['Host']] = $row;
}
@PMA_DBI_free_result($result);
@PMA_DBI_freeResult($result);
$html_output
= '<form name="usersForm" id="usersForm" action="server_privileges.php" '
@ -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;
}
@ -2663,12 +2663,12 @@ function PMA_getDbRightsForUserOverview()
$db_rights_result = PMA_DBI_query($db_rights_sql);
while ($db_rights_row = PMA_DBI_fetch_assoc($db_rights_result)) {
while ($db_rights_row = PMA_DBI_fetchAssoc($db_rights_result)) {
$db_rights_row = array_merge($user_defaults, $db_rights_row);
$db_rights[$db_rights_row['User']][$db_rights_row['Host']]
= $db_rights_row;
}
PMA_DBI_free_result($db_rights_result);
PMA_DBI_freeResult($db_rights_result);
ksort($db_rights);
return $db_rights;
@ -2936,7 +2936,7 @@ function PMA_getHtmlForDisplayUserOverviewPage($link_edit, $pmaThemeImage,
if (! $res) {
$html_output .= PMA_Message::error(__('No Privileges'))->getDisplay();
PMA_DBI_free_result($res);
PMA_DBI_freeResult($res);
unset($res);
} else {
// This message is hardcoded because I will replace it by
@ -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,
@ -3119,7 +3119,7 @@ function PMA_getTablePrivsQueriesForChangeOrCopyUser($user_host_condition,
$GLOBALS['userlink'],
PMA_DBI_QUERY_STORE
);
while ($row = PMA_DBI_fetch_assoc($res)) {
while ($row = PMA_DBI_fetchAssoc($res)) {
$res2 = PMA_DBI_QUERY(
'SELECT `Column_name`, `Column_priv`'
@ -3145,7 +3145,7 @@ function PMA_getTablePrivsQueriesForChangeOrCopyUser($user_host_condition,
'References' => array()
);
while ($row2 = PMA_DBI_fetch_assoc($res2)) {
while ($row2 = PMA_DBI_fetchAssoc($res2)) {
$tmp_array = explode(',', $row2['Column_priv']);
if (in_array('Select', $tmp_array)) {
$tmp_privs2['Select'][] = $row2['Column_name'];
@ -3202,14 +3202,14 @@ function PMA_getDbSpecificPrivsQueriesForChangeOrCopyUser(
$res = PMA_DBI_query('SELECT * FROM `mysql`.`db`' . $user_host_condition);
while ($row = PMA_DBI_fetch_assoc($res)) {
while ($row = PMA_DBI_fetchAssoc($res)) {
$queries[] = 'GRANT ' . join(', ', PMA_extractPrivInfo($row))
.' ON ' . PMA_Util::backquote($row['Db']) . '.*'
.' TO \'' . PMA_Util::sqlAddSlashes($username)
. '\'@\'' . 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

12
libraries/sql.lib.php
View File

@ -150,9 +150,9 @@ function getTableHtmlForMultipleQueries(
$analyzed_sql = array();
$is_affected = false;
$result = PMA_DBI_store_result();
$result = PMA_DBI_storeResult();
$fields_meta = ($result !== false)
? PMA_DBI_get_fields_meta($result)
? PMA_DBI_getFieldsMeta($result)
: array();
$fields_cnt = count($fields_meta);
@ -224,9 +224,9 @@ function getTableHtmlForMultipleQueries(
}
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();
}
if (isset($sql_data['valid_sql'][$sql_no])) {
@ -257,11 +257,11 @@ function getTableHtmlForMultipleQueries(
);
// Free the result to save the memory
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
$sql_no++;
} while (PMA_DBI_more_results() && PMA_DBI_next_result());
} while (PMA_DBI_moreResults() && PMA_DBI_nextResult());
return $table_html;
}

4
libraries/structure.lib.php
View File

@ -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

2
libraries/tbl_columns_definition_form.inc.php
View File

@ -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');

2
libraries/tbl_info.inc.php
View File

@ -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']);
/**

4
libraries/tbl_views.lib.php
View File

@ -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) {
@ -106,7 +106,7 @@ function PMA_getNewTransformationDataSql(
$column_count = 0;
$add_comma = false;
while ($data_row = PMA_DBI_fetch_assoc($pma_tranformation_data)) {
while ($data_row = PMA_DBI_fetchAssoc($pma_tranformation_data)) {
foreach ($column_map as $column) {

6
libraries/transformations.lib.php
View File

@ -282,9 +282,9 @@ 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) {
$row = @PMA_DBI_fetch_assoc($test_rs);
PMA_DBI_free_result($test_rs);
if ($test_rs && PMA_DBI_numRows($test_rs) > 0) {
$row = @PMA_DBI_fetchAssoc($test_rs);
PMA_DBI_freeResult($test_rs);
if (! $forcedelete
&& (strlen($mimetype) || strlen($transformation)

4
pmd_pdf.php
View File

@ -109,11 +109,11 @@ $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 '<p>' . __('Page:');
echo '<select name="pdf_page_number">';
while ($page = PMA_DBI_fetch_assoc($table_info_result)) {
while ($page = PMA_DBI_fetchAssoc($table_info_result)) {
echo '<option value="' . $page['page_nr'] . '">';
echo htmlspecialchars($page['page_descr']);
echo '</option>';

8
pmd_relation_new.php
View File

@ -42,20 +42,20 @@ 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);
PMA_DBI_freeResult($result);
$result = PMA_DBI_query(
'SHOW INDEX FROM ' . PMA_Util::backquote($db)
. '.' . 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);
PMA_DBI_freeResult($result);
if (! empty($index_array1[$F1]) && ! empty($index_array2[$F2])) {
$upd_query = 'ALTER TABLE ' . PMA_Util::backquote($db)

9
po/de.po
View File

@ -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. <me@mynetx.net>\n"
"Language-Team: German <http://l10n.cihar.com/projects/phpmyadmin/master/de/"
">\n"
"PO-Revision-Date: 2013-05-06 11:06+0200\n"
"Last-Translator: David Däster <dfd1985@gmail.com>\n"
"Language-Team: German <http://l10n.cihar.com/projects/phpmyadmin/master/de/>\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!"

37
po/ia.po
View File

@ -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 <g.sora@tiscali.it>\n"
"Language-Team: Interlingua <http://l10n.cihar.com/projects/phpmyadmin/master/"
"ia/>\n"
"Language-Team: Interlingua "
"<http://l10n.cihar.com/projects/phpmyadmin/master/ia/>\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"

9
po/th.po
View File

@ -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ř <michal@cihar.com>\n"
"PO-Revision-Date: 2013-05-06 11:03+0200\n"
"Last-Translator: Anusuk Sangubon <jaideejung007@gmail.com>\n"
"Language-Team: Thai <http://l10n.cihar.com/projects/phpmyadmin/master/th/>\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"

2
schema_export.php
View File

@ -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')) {

4
server_binlog.php
View File

@ -55,7 +55,7 @@ $result = PMA_DBI_query($sql_query);
*/
// Gets the list of fields properties
if (isset($result) && $result) {
$num_rows = PMA_DBI_num_rows($result);
$num_rows = PMA_DBI_numRows($result);
} else {
$num_rows = 0;
}
@ -193,7 +193,7 @@ $html .= '</td>'
. '<tbody>';
$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']
) {

4
server_plugins.php
View File

@ -43,12 +43,12 @@ $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;
}
PMA_DBI_free_result($res);
PMA_DBI_freeResult($res);
// sort plugin list (modules are already sorted)
ksort($plugins);

2
server_status.php
View File

@ -502,7 +502,7 @@ function getTableProcesslistHtml($ServerStatusData)
$retval .= '<tbody>';
$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

20
server_status_monitor.php
View File

@ -64,7 +64,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
case 'proc':
$result = PMA_DBI_query('SHOW PROCESSLIST');
$ret[$chart_id][$node_id][$point_id]['value']
= PMA_DBI_num_rows($result);
= PMA_DBI_numRows($result);
break;
case 'cpu':
@ -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'], ' '))
);
@ -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;
@ -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]);
@ -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;
@ -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()) {
@ -367,14 +367,14 @@ 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;
}
// In case an error happened
$return['error'] = PMA_DBI_getError();
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
if ($profiling) {
$return['profiling'] = array();
@ -382,10 +382,10 @@ 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);
PMA_DBI_freeResult($result);
}
PMA_Response::getInstance()->addJSON('message', $return);

7
server_status_variables.php
View File

@ -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 .= '<abbr title="'
// makes available the raw value as a title
. htmlspecialchars(PMA_Util::formatNumber($value, 0))
. '">'
. 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))
. '</abbr>';
} elseif (is_numeric($value)) {
$retval .= htmlspecialchars(PMA_Util::formatNumber($value, 3, 1));
} else {

22
sql.php
View File

@ -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;
@ -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);
}
@ -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.

2
tbl_addfield.php
View File

@ -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
);

4
tbl_change.php
View File

@ -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);
@ -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']) {

6
tbl_chart.php
View File

@ -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;
}
@ -103,8 +103,8 @@ if (strlen($GLOBALS['table'])) {
$data = array();
$result = PMA_DBI_tryQuery($sql_query);
$fields_meta = PMA_DBI_get_fields_meta($result);
while ($row = PMA_DBI_fetch_assoc($result)) {
$fields_meta = PMA_DBI_getFieldsMeta($result);
while ($row = PMA_DBI_fetchAssoc($result)) {
$data[] = $row;
}

6
tbl_create.php
View File

@ -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)),
'',
@ -268,8 +268,8 @@ 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);
PMA_DBI_free_result($tbl_stats_result);
$tbl_stats = PMA_DBI_fetchAssoc($tbl_stats_result);
PMA_DBI_freeResult($tbl_stats_result);
unset($tbl_stats_result);
if ($is_show_stats) {

2
tbl_get_field.php
View File

@ -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)),
'', ''

4
tbl_gis_visualization.php
View File

@ -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();
@ -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;
}

2
tbl_move_copy.php
View File

@ -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'];

4
tbl_operations.php
View File

@ -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) {

2
tbl_printview.php
View File

@ -43,7 +43,7 @@ if (strlen($table)) {
/**
* Selects the database
*/
PMA_DBI_select_db($db);
PMA_DBI_selectDb($db);
/**

4
tbl_relation.php
View File

@ -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
@ -362,7 +362,7 @@ if ($cfgRelation['relwork']
} // end if
// Now find out the columns of our $table
// 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
$columns = PMA_DBI_getColumns($db, $table);
if (count($columns) > 0) {

2
tbl_replace.php
View File

@ -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

10
tbl_tracking.php
View File

@ -715,10 +715,10 @@ $sql_query = " SELECT DISTINCT db_name, table_name FROM " .
$sql_result = PMA_queryAsControlUser($sql_query);
if (PMA_DBI_num_rows($sql_result) > 0) {
if (PMA_DBI_numRows($sql_result) > 0) {
echo '<form method="post" action="tbl_tracking.php?' . $url_query . '">';
echo '<select name="table">';
while ($entries = PMA_DBI_fetch_array($sql_result)) {
while ($entries = PMA_DBI_fetchArray($sql_result)) {
if (PMA_Tracker::isTracked($entries['db_name'], $entries['table_name'])) {
$status = ' (' . __('active') . ')';
} else {
@ -752,7 +752,7 @@ $sql_query = " SELECT * FROM " .
$sql_result = PMA_queryAsControlUser($sql_query);
$last_version = 0;
$maxversion = PMA_DBI_fetch_array($sql_result);
$maxversion = PMA_DBI_fetchArray($sql_result);
$last_version = $maxversion['version'];
if ($last_version > 0) {
@ -771,8 +771,8 @@ if ($last_version > 0) {
echo '<tbody>';
$style = 'odd';
PMA_DBI_data_seek($sql_result, 0);
while ($version = PMA_DBI_fetch_array($sql_result)) {
PMA_DBI_dataSeek($sql_result, 0);
while ($version = PMA_DBI_fetchArray($sql_result)) {
if ($version['tracking_active'] == 1) {
$version_status = __('active');
} else {

8
tbl_zoom_select.php
View File

@ -62,8 +62,8 @@ 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);
while ($row = PMA_DBI_fetch_assoc($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;
foreach ($row as $col => $val) {
@ -139,8 +139,8 @@ 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)) {
$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
$tmpRow = array();

33
test/classes/config/PMA_Form_test.php Normal file
View File

@ -0,0 +1,33 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* tests for Form class in config folder
*
* @package PhpMyAdmin-test
*/
require_once 'libraries/config/ConfigFile.class.php';
require_once 'libraries/config/Form.class.php';
require_once 'libraries/Util.class.php';
class PMA_Form_Test extends PHPUnit_Framework_TestCase
{
public function testContructor()
{
$form = new Form('pma_form_name', array('pma_form1','pma_form2'), 1);
$this->assertEquals(
1,
$form->index
);
$this->assertEquals(
'pma_form_name',
$form->name
);
$this->assertArrayHasKey(
'pma_form1',
$form->fields
);
}
}
?>

51
test/classes/navigation/PMA_Node_Column_test.php Normal file
View File

@ -0,0 +1,51 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* tests for NodeFactory class and Node_Column class
*
* @package PhpMyAdmin-test
*/
require_once 'libraries/navigation/NodeFactory.class.php';
require_once 'libraries/Util.class.php';
require_once 'libraries/Theme.class.php';
class Node_Column_Test extends PHPUnit_Framework_TestCase
{
public function setup()
{
$GLOBALS['server'] = 0;
$GLOBALS['token'] = 'token';
$_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
}
public function testConstructor()
{
$parent = PMA_NodeFactory::getInstance('Node_Column');
$this->assertArrayHasKey(
'text',
$parent->links
);
$this->assertContains(
'tbl_structure.php',
$parent->links['text']
);
}
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
);
}
}
?>

51
test/classes/navigation/PMA_Node_Database_test.php Normal file
View File

@ -0,0 +1,51 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* tests for NodeFactory class and Node_Column class
*
* @package PhpMyAdmin-test
*/
require_once 'libraries/navigation/NodeFactory.class.php';
require_once 'libraries/Util.class.php';
require_once 'libraries/Theme.class.php';
class Node_Database_Test extends PHPUnit_Framework_TestCase
{
public function setup()
{
$GLOBALS['server'] = 0;
$GLOBALS['token'] = 'token';
$_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
}
public function testConstructor()
{
$parent = PMA_NodeFactory::getInstance('Node_Database');
$this->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
);
}
}
?>

51
test/classes/navigation/PMA_Node_Event_test.php Normal file
View File

@ -0,0 +1,51 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* tests for NodeFactory class and Node_Column class
*
* @package PhpMyAdmin-test
*/
require_once 'libraries/navigation/NodeFactory.class.php';
require_once 'libraries/Util.class.php';
require_once 'libraries/Theme.class.php';
class Node_Event_Test extends PHPUnit_Framework_TestCase
{
public function setup()
{
$GLOBALS['server'] = 0;
$GLOBALS['token'] = 'token';
$_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
}
public function testConstructor()
{
$parent = PMA_NodeFactory::getInstance('Node_Event');
$this->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
);
}
}
?>

Some files were not shown because too many files have changed in this diff Show More