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

bug 696215

Browse Source
This commit is contained in:
Marc Delisle
2003-04-18 11:58:23 +00:00
parent aaa5f33697
commit e48612fe90
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -8,6 +8,8 @@ $Source$
2003-04-18 Marc Delisle <lem9@users.sourceforge.net> 2003-04-18 Marc Delisle <lem9@users.sourceforge.net>
* Documentation.html: faq about double auth windows * Documentation.html: faq about double auth windows
* lang/ukrainian: update, thanks to Markijan Baran * lang/ukrainian: update, thanks to Markijan Baran
* tbl_relation.php3: bug 696215: can now choose all segments
of the primary key
2003-04-17 Marc Delisle <lem9@users.sourceforge.net> 2003-04-17 Marc Delisle <lem9@users.sourceforge.net>
* lang/ukrainian: update, thanks to Markijan Baran * lang/ukrainian: update, thanks to Markijan Baran

16
tbl_relation.php3
View File

@@ -123,21 +123,27 @@ if ($cfgRelation['relwork']) {
$fi_query = 'SHOW KEYS FROM ' . PMA_backquote($curr_table[0]); $fi_query = 'SHOW KEYS FROM ' . PMA_backquote($curr_table[0]);
$fi_rs = PMA_mysql_query($fi_query) or PMA_mysqlDie('', $fi_query, '', $err_url_0); $fi_rs = PMA_mysql_query($fi_query) or PMA_mysqlDie('', $fi_query, '', $err_url_0);
if ($fi_rs && mysql_num_rows($fi_rs) > 0) { if ($fi_rs && mysql_num_rows($fi_rs) > 0) {
$seen_a_primary=FALSE;
while ($curr_field = PMA_mysql_fetch_array($fi_rs)) { while ($curr_field = PMA_mysql_fetch_array($fi_rs)) {
if (isset($curr_field['Key_name']) && $curr_field['Key_name'] == 'PRIMARY') { if (isset($curr_field['Key_name']) && $curr_field['Key_name'] == 'PRIMARY') {
$seen_a_primary=TRUE;
$field_full = $db . '.' .$curr_field['Table'] . '.' . $curr_field['Column_name']; $field_full = $db . '.' .$curr_field['Table'] . '.' . $curr_field['Column_name'];
$field_v = $curr_field['Table'] . '->' . $curr_field['Column_name']; $field_v = $curr_field['Table'] . '->' . $curr_field['Column_name'];
break; $selectboxall[$field_full] = $field_v;
} else if (isset($curr_field['Non_unique']) && $curr_field['Non_unique'] == 0) { // there could be more than one segment of the primary
// so do not break
} else if (isset($curr_field['Non_unique']) && $curr_field['Non_unique'] == 0 && $seen_a_primary==FALSE) {
// if we can't find a primary key we take any unique one // if we can't find a primary key we take any unique one
// (in fact, we show all segments of unique keys
// and all unique keys)
$field_full = $db . '.' . $curr_field['Table'] . '.' . $curr_field['Column_name']; $field_full = $db . '.' . $curr_field['Table'] . '.' . $curr_field['Column_name'];
$field_v = $curr_field['Table'] . '->' . $curr_field['Column_name']; $field_v = $curr_field['Table'] . '->' . $curr_field['Column_name'];
$selectboxall[$field_full] = $field_v;
} // end if } // end if
} // end while over keys } // end while over keys
if (isset($field_full) && isset($field_v)) {
$selectboxall[$field_full] = $field_v;
}
} // end if (mysql_num_rows) } // end if (mysql_num_rows)
// Mike Beck - 24.07.02: i've been asked to add all keys of the // Mike Beck - 24.07.02: i've been asked to add all keys of the
// current table (see bug report #574851) // current table (see bug report #574851)
} }