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

bug 860258

Browse Source
This commit is contained in:
Marc Delisle
2003-12-18 20:59:04 +00:00
parent d7764fdd17
commit a58afea58a
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -5,6 +5,11 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2003-12-18 Marc Delisle <lem9@users.sourceforge.net>
* tbl_relation.php: bug 860258: do not destroy foreign key references
to another db (still cannot enter via phpMyAdmin this kind of
references)
2003-12-17 Michal Cihar <ilovetranslations@cihar.com> 2003-12-17 Michal Cihar <ilovetranslations@cihar.com>
* lang/sync_lang.sh: Fix generation of translation, when source is in * lang/sync_lang.sh: Fix generation of translation, when source is in
utf-8. utf-8.

25
tbl_relation.php
View File

@@ -109,7 +109,8 @@ if ($cfgRelation['relwork']
// u p d a t e s f o r I n n o D B // u p d a t e s f o r I n n o D B
// ( for now, same db only, and one index name) // ( for now, one index name; we keep the definitions if the
// foreign db is not the same)
if (isset($destination_innodb)) { if (isset($destination_innodb)) {
foreach($destination_innodb AS $master_field => $foreign_string) { foreach($destination_innodb AS $master_field => $foreign_string) {
if ($foreign_string != 'nix') { if ($foreign_string != 'nix') {
@@ -119,11 +120,16 @@ if ($cfgRelation['relwork']
// The next few lines are repeated below, so they // The next few lines are repeated below, so they
// could be put in an include file // could be put in an include file
// Note: I tried to enclose the db and table name with
// backquotes but MySQL 4.0.16 did not like the syntax
// (for example: `base2`.`table1` )
$upd_query = 'ALTER TABLE ' . $table $upd_query = 'ALTER TABLE ' . $table
. ' ADD FOREIGN KEY (' . ' ADD FOREIGN KEY ('
. PMA_backquote(PMA_sqlAddslashes($master_field)) . ')' . PMA_backquote(PMA_sqlAddslashes($master_field)) . ')'
. ' REFERENCES ' . ' REFERENCES '
. PMA_backquote(PMA_sqlAddslashes($foreign_table)) . '(' . PMA_backquote(PMA_sqlAddslashes($foreign_db) . '.'
. PMA_sqlAddslashes($foreign_table)) . '('
. PMA_backquote(PMA_sqlAddslashes($foreign_field)) . ')'; . PMA_backquote(PMA_sqlAddslashes($foreign_field)) . ')';
if (${$master_field . '_on_delete'} != 'nix') { if (${$master_field . '_on_delete'} != 'nix') {
@@ -158,7 +164,8 @@ if ($cfgRelation['relwork']
. ' ADD FOREIGN KEY (' . ' ADD FOREIGN KEY ('
. PMA_backquote(PMA_sqlAddslashes($master_field)) . ')' . PMA_backquote(PMA_sqlAddslashes($master_field)) . ')'
. ' REFERENCES ' . ' REFERENCES '
. PMA_backquote(PMA_sqlAddslashes($foreign_table)) . '(' . PMA_backquote(PMA_sqlAddslashes($foreign_db) . '.'
. PMA_sqlAddslashes($foreign_table)) . '('
. PMA_backquote(PMA_sqlAddslashes($foreign_field)) . ')'; . PMA_backquote(PMA_sqlAddslashes($foreign_field)) . ')';
if (${$master_field . '_on_delete'} != 'nix') { if (${$master_field . '_on_delete'} != 'nix') {
@@ -422,15 +429,27 @@ if ($col_rs && mysql_num_rows($col_rs) > 0) {
} else { } else {
$foreign_field = FALSE; $foreign_field = FALSE;
} }
$found_foreign_field = FALSE;
foreach($selectboxall_innodb AS $key => $value) { foreach($selectboxall_innodb AS $key => $value) {
echo ' ' echo ' '
. '<option value="' . htmlspecialchars($key) . '"'; . '<option value="' . htmlspecialchars($key) . '"';
if ($foreign_field && $key == $foreign_field) { if ($foreign_field && $key == $foreign_field) {
echo ' selected="selected"'; echo ' selected="selected"';
$found_foreign_field = TRUE;
} }
echo '>' . $value . '</option>'. "\n"; echo '>' . $value . '</option>'. "\n";
} // end while } // end while
// we did not find the foreign field in the tables of current db,
// must be defined in another db so show it to avoid erasing it
if (!$found_foreign_field && $foreign_field) {
echo ' '
. '<option value="' . htmlspecialchars($foreign_field) . '"';
echo ' selected="selected"';
echo '>' . $foreign_field . '</option>'. "\n";
}
?> ?>
</select> </select>
</td> </td>