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

errors corrected

Browse Source
This commit is contained in:
Spun Nakandala 2013-08-29 21:58:35 +05:30
parent bf2c85c877
commit 207ee1ffc3
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/tbl_relation.lib.php
View File

@ -832,10 +832,11 @@ function PMA_handleUpdatesForForeignKeys($destination_foreign_db,
$multi_edit_columns_name, $destination_foreign_table,
$destination_foreign_column, $options_array, $table, $existrel_foreign
) {
$html_output = '';
$display_query = '';
$seen_error = false;
foreach ($destination_foreign_db as $master_field_md5 => $foreign_db) {
PMA_handleUpdateForForeignKey(
$html_output .= PMA_handleUpdateForForeignKey(
$multi_edit_columns_name, $master_field_md5,
$destination_foreign_table, $destination_foreign_column, $options_array,
$existrel_foreign, $table, $seen_error, $display_query, $foreign_db
@ -865,12 +866,13 @@ function PMA_handleUpdatesForForeignKeys($destination_foreign_db,
* @param string $display_query display query
* @param string $foreign_db foreign database
*
* @return void
* @return string
*/
function PMA_handleUpdateForForeignKey($multi_edit_columns_name, $master_field_md5,
$destination_foreign_table, $destination_foreign_column, $options_array,
$existrel_foreign, $table, &$seen_error, &$display_query, $foreign_db
) {
$html_output = '';
$create = false;
$drop = false;
@ -923,7 +925,7 @@ function PMA_handleUpdateForForeignKey($multi_edit_columns_name, $master_field_m
$html_output .= PMA_Util::mysqlDie(
$tmp_error_drop, $drop_query, false, '', false
);
return;
return $html_output;
}
}
$tmp_error_create = false;
@ -978,5 +980,7 @@ function PMA_handleUpdateForForeignKey($multi_edit_columns_name, $master_field_m
$GLOBALS['dbi']->tryQuery($sql_query_recreate);
}
}
return $html_output;
}
?>

5
tbl_relation.php
View File

@ -103,11 +103,13 @@ if (isset($destination_db) && $cfgRelation['relwork']) {
);
} // end if (updates for internal relations)
$html_output = '';
// u p d a t e s f o r f o r e i g n k e y s
// (for now, one index name only; we keep the definitions if the
// foreign db is not the same)
if (isset($destination_foreign_db)) {
$html_output = PMA_handleUpdatesForForeignKeys(
$html_output .= PMA_handleUpdatesForForeignKeys(
$destination_foreign_db,
$multi_edit_columns_name, $destination_foreign_table,
$destination_foreign_column, $options_array, $table,
@ -117,7 +119,6 @@ if (isset($destination_foreign_db)) {
// U p d a t e s f o r d i s p l a y f i e l d
if ($cfgRelation['displaywork'] && isset($display_field)) {
PMA_handleUpdateForDisplayField(
$disp, $display_field, $db, $table, $cfgRelation