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

drop-down in Select sub-page

Browse Source
This commit is contained in:
Marc Delisle
2002-10-03 21:25:21 +00:00
parent a12ea6f991
commit 9c0b758a6e
3 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -5,6 +5,11 @@ phpMyAdmin - Changelog
$Id$
$Source$
2002-10-03 Marc Delisle <lem9@users.sourceforge.net>
* tbl_select.php3, tbl_change.php3,
new libraries/get_foreign.lib.php3: drop-down of foreign keys
on Select sub-page, thanks to Markus L. Noga (mlnoga)
2002-10-03 Alexander M. Turek <rabus@users.sourceforge.net>
* tbl_dump.php3, libraries/build_dump.lib.php3: Completed fix against
bug #607896, thanks to Lo<4C>c.

34
tbl_change.php3
View File

@@ -392,39 +392,7 @@ for ($i = 0; $i < $fields_cnt; $i++) {
// The value column (depends on type)
// ----------------
// <markus@noga.de>
// selection box for foreign keys
// lem9: we always show the foreign field in the drop-down; if a display
// field is defined, we show it besides the foreign field
if ($foreigners && isset($foreigners[$field])) {
$foreigner = $foreigners[$field];
$foreign_db = $foreigner['foreign_db'];
$foreign_table = $foreigner['foreign_table'];
$foreign_field = $foreigner['foreign_field'];
// Count number of rows in the foreign table. Currently we do
// not use a drop-down if more than 200 rows in the foreign table,
// for speed reasons and because we need a better interface for this.
//
// We could also do the SELECT anyway, with a LIMIT, and ensure that
// the current value of the field is one of the choices.
$count_query = 'SELECT COUNT(*) AS total FROM ' . PMA_backquote($foreign_db) . '.' . PMA_backquote($foreign_table);
$count_result = PMA_mysql_query($count_query) or PMA_mysqlDie('', $count_query, '', $err_url);
$the_total = PMA_mysql_result($count_result, 0, 'total');
mysql_free_result($count_result);
if ($the_total < 200) {
// foreign_display can be FALSE if no display field defined:
$foreign_display = PMA_getDisplayField($foreign_db, $foreign_table);
$dispsql = 'SELECT ' . PMA_backquote($foreign_field)
. (($foreign_display == FALSE) ? '' : ', ' . PMA_backquote($foreign_display))
. ' FROM ' . PMA_backquote($foreign_db) . '.' . PMA_backquote($foreign_table)
. ' ORDER BY ' . PMA_backquote($foreign_table) . '.' . PMA_backquote($foreign_display);
$disp = PMA_mysql_query($dispsql);
}
} // end if $foreigners
require('./libraries/get_foreign.lib.php3');
if (isset($disp) && $disp) {
?>

39
tbl_select.php3
View File

@@ -7,6 +7,7 @@
*/
require('./libraries/grab_globals.lib.php3');
require('./libraries/common.lib.php3');
require('./libraries/relation.lib.php3'); // foreign keys
/**
@@ -62,6 +63,11 @@ if (!isset($param) || $param[0] == '') {
$fields_type[] = $type;
} // end while
mysql_free_result($result);
// <markus@noga.de>
// retrieve keys into foreign fields, if any
$cfgRelation = PMA_getRelationsParam();
$foreigners = ($cfgRelation['relwork'] ? PMA_getForeigners($db, $table) : FALSE);
?>
<form method="post" action="tbl_select.php3">
<input type="hidden" name="server" value="<?php echo $server; ?>" />
@@ -132,9 +138,36 @@ if (!isset($param) || $param[0] == '') {
</select>
</td>
<td bgcolor="<?php echo $bgcolor; ?>">
<input type="text" name="fields[]" size="40" class="textfield" />
<input type="hidden" name="names[]" value="<?php echo urlencode($fields_list[$i]); ?>" />
<input type="hidden" name="types[]" value="<?php echo $fields_type[$i]; ?>" />
<?php
// <markus@noga.de>
$field=$fields_list[$i];
require('./libraries/get_foreign.lib.php3');
if($foreigners && isset($foreigners[$field]) &&
isset($disp) && $disp) {
?>
<select name="fields[]">
<option value=""></option>
<?php
while ($relrow = @PMA_mysql_fetch_array($disp)) {
$key = $relrow[$foreign_field];
$value = (($foreign_display != FALSE) ? '-' . htmlspecialchars($relrow[$foreign_display]) : '');
echo ' <option value="' . urlencode($key) . '">'.
htmlspecialchars($key) . $value . '</option>' . "\n";
} // end while
?>
</select>
<?php
} else {
?>
<input type="text" name="fields[]" size="40" class="textfield" />
<?php
}
?>
<input type="hidden" name="names[]" value="<?php echo urlencode($fields_list[$i]); ?>" />
<input type="hidden" name="types[]" value="<?php echo $fields_type[$i]; ?>" />
</td>
</tr>
<?php