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

Some more variable name improvements

Browse Source
This commit is contained in:
Atul Pratap Singh 2012-07-17 06:54:14 +05:30
parent 867356b072
commit ec6ac79775
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libraries/db_qbe.lib.php
View File

@ -901,7 +901,7 @@ function PMA_dbQbeGetFromClause($criteriaColumn, $criteria, $cfgRelation)
$from_clause = '';
if (isset($criteriaColumn) && count($criteriaColumn) > 0) {
// Initialize some variables
$all_tables = $all_columns = $tab_know = $left_tables = array();
$all_tables = $all_columns = $known_tables = $remaining_tables = array();
$left_join = '';
// We only start this if we have fields, otherwise it would be dumb
@ -926,23 +926,23 @@ function PMA_dbQbeGetFromClause($criteriaColumn, $criteria, $cfgRelation)
$master = PMA_dbQbeGetMasterTable(
$db, $all_tables, $all_columns, $where_clause_columns, $where_clause_tables
);
$left_tables = $all_tables;
unset($left_tables[$master]);
$tab_know[$master] = $master;
$remaining_tables = $all_tables;
unset($remaining_tables[$master]);
$known_tables[$master] = $master;
$run = 0;
$emerg = '';
while (count($left_tables) > 0) {
while (count($remaining_tables) > 0) {
if ($run % 2 == 0) {
$left_join .= PMA_getRelatives('master', $left_tables, $tab_know);
$left_join .= PMA_getRelatives('master', $remaining_tables, $known_tables);
} else {
$left_join .= PMA_getRelatives('foreign', $left_tables, $tab_know);
$left_join .= PMA_getRelatives('foreign', $remaining_tables, $known_tables);
}
$run++;
if ($run > 5) {
foreach ($left_tables as $table) {
foreach ($remaining_tables as $table) {
$emerg .= ', ' . PMA_CommonFunctions::getInstance()->backquote($table);
unset($left_tables[$table]);
unset($remaining_tables[$table]);
}
}
} // end while

18
libraries/relation.lib.php
View File

@ -1161,14 +1161,14 @@ function PMA_getForeignData($foreigners, $field, $override_total, $foreign_filte
/**
* Finds all related tables
*
* @param string $from Whether to go from master to foreign or vice versa
* @param array $left_tables The list of tables that we still couldn't connect
* @param array $tab_know The list of allready connected tables
* @param string $from Whether to go from master to foreign or vice versa
* @param array $remaining_tables The list of tables that we still couldn't connect
* @param array $known_tables The list of allready connected tables
*
* @return string LEFT JOIN
* @access private
*/
function PMA_getRelatives($from, $left_tables, $tab_know)
function PMA_getRelatives($from, $remaining_tables, $known_tables)
{
$fromclause = '';
$common_functions = PMA_CommonFunctions::getInstance();
@ -1178,8 +1178,8 @@ function PMA_getRelatives($from, $left_tables, $tab_know)
} else {
$to = 'master';
}
$in_know = '(\'' . implode('\', \'', $tab_know) . '\')';
$in_left = '(\'' . implode('\', \'', $left_tables) . '\')';
$in_know = '(\'' . implode('\', \'', $known_tables) . '\')';
$in_left = '(\'' . implode('\', \'', $remaining_tables) . '\')';
$rel_query = 'SELECT *'
. ' FROM ' . $common_functions->backquote($GLOBALS['cfgRelation']['db'])
@ -1191,7 +1191,7 @@ function PMA_getRelatives($from, $left_tables, $tab_know)
$relations = @PMA_DBI_query($rel_query, $GLOBALS['controllink']);
while ($row = PMA_DBI_fetch_assoc($relations)) {
$found_table = $row[$to . '_table'];
if (isset($left_tables[$found_table])) {
if (isset($remaining_tables[$found_table])) {
$fromclause
.= "\n" . ' LEFT JOIN '
. $common_functions->backquote($GLOBALS['db']) . '.' . $common_functions->backquote($row[$to . '_table']) . ' ON '
@ -1199,8 +1199,8 @@ function PMA_getRelatives($from, $left_tables, $tab_know)
. $common_functions->backquote($row[$from . '_field']) . ' = '
. $common_functions->backquote($row[$to . '_table']) . '.'
. $common_functions->backquote($row[$to . '_field']) . ' ';
$tab_know[$found_table] = $found_table;
unset($left_tables[$found_table]);
$known_tables[$found_table] = $found_table;
unset($remaining_tables[$found_table]);
}
} // end while