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

revised table relation code

Browse Source
This commit is contained in:
Sebastian Mendel
2007-12-19 16:10:23 +00:00
parent 7b97eaa6f0
commit b0e3a115be
2 changed files with 122 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
libraries/Table.class.php
View File

@@ -1047,5 +1047,59 @@ class PMA_Table {
htmlspecialchars($old_name), htmlspecialchars($new_name)); htmlspecialchars($old_name), htmlspecialchars($new_name));
return true; return true;
} }
/**
* Get all unique columns
*
* returns an array with all columns with unqiue content, in fact these are
* all columns being single indexed in PRIMARY or UNIQUE
*
* f.e.
* - PRIMARY(id) // id
* - UNIQUE(name) // name
* - PRIMARY(fk_id1, fk_id2) // NONE
* - UNIQUE(x,y) // NONE
*
*
* @return array
*/
public function getUniqueColumns()
{
$sql = 'SHOW INDEX FROM ' . $this->getFullName(true) . ' WHERE Non_unique = 0';
$uniques = PMA_DBI_fetch_result($sql, array('Key_name', null), 'Column_name');
$return = array();
foreach ($uniques as $index) {
if (count($index) > 1) {
continue;
}
$return[] = $this->getFullName(true) . '.' . PMA_backquote($index[0]);
}
return $return;
}
/**
* Get all indexed columns
*
* returns an array with all columns make use of an index, in fact only
* first columns in an index
*
* f.e. index(col1, col2) would only return col1
*
* @return array
*/
public function getIndexedColumns()
{
$sql = 'SHOW INDEX FROM ' . $this->getFullName(true) . ' WHERE Seq_in_index = 1';
$indexed = PMA_DBI_fetch_result($sql, 'Column_name', 'Column_name');
$return = array();
foreach ($indexed as $column) {
$return[] = $this->getFullName(true) . '.' . PMA_backquote($column);
}
return $return;
}
} }
?> ?>

184
tbl_relation.php
View File

@@ -1,7 +1,15 @@
<?php <?php
/* vim: set expandtab sw=4 ts=4 sts=4: */ /* vim: set expandtab sw=4 ts=4 sts=4: */
/** /**
* Display table relations for viewing and editing
* *
* includes phpMyAdmin relations and InnoDB relations
*
* @todo fix name handling: currently names with dots (.) are not properly handled
* @todo foreign key constraints require both fields being of equal type and size
* @todo check foreign fields to be from same type and size, all other makes no sense
* @todo add an link to create an index required for constraints, or an option to do automatically
* @todo if above todos are fullfilled we can add all fields meet requirements in the select dropdown
* @version $Id$ * @version $Id$
*/ */
@@ -30,7 +38,12 @@ require_once './libraries/tbl_links.inc.php';
require_once './libraries/relation.lib.php'; require_once './libraries/relation.lib.php';
$options_array = array('CASCADE' => 'CASCADE', 'SET_NULL' => 'SET NULL', 'NO_ACTION' => 'NO ACTION', 'RESTRICT' => 'RESTRICT'); $options_array = array(
'CASCADE' => 'CASCADE',
'SET_NULL' => 'SET NULL',
'NO_ACTION' => 'NO ACTION',
'RESTRICT' => 'RESTRICT',
);
/** /**
* Generate dropdown choices * Generate dropdown choices
@@ -44,23 +57,21 @@ $options_array = array('CASCADE' => 'CASCADE', 'SET_NULL' => 'SET NULL', 'NO_ACT
*/ */
function PMA_generate_dropdown($dropdown_question, $radio_name, $choices, $selected_value) function PMA_generate_dropdown($dropdown_question, $radio_name, $choices, $selected_value)
{ {
echo $dropdown_question . '&nbsp;&nbsp;'; echo htmlspecialchars($dropdown_question) . '&nbsp;&nbsp;';
echo '<select name="' . $radio_name . '">' . "\n"; echo '<select name="' . htmlspecialchars($radio_name) . '">' . "\n";
echo '<option value="nix">--</option>' . "\n"; echo '<option value=""></option>' . "\n";
foreach ($choices AS $one_value => $one_label) { foreach ($choices as $one_value => $one_label) {
echo '<option value="' . $one_value . '"'; echo '<option value="' . htmlspecialchars($one_value) . '"';
if ($selected_value == $one_value) { if ($selected_value == $one_value) {
echo ' selected="selected" '; echo ' selected="selected" ';
} }
echo '>' . $one_label . '</option>' . "\n"; echo '>' . htmlspecialchars($one_label) . '</option>' . "\n";
} }
echo '</select>' . "\n"; echo '</select>' . "\n";
echo "\n";
} }
/** /**
* Gets the relation settings * Gets the relation settings
*/ */
@@ -70,15 +81,10 @@ $cfgRelation = PMA_getRelationsParam();
/** /**
* Updates * Updates
*/ */
// ensure we are positionned to our current db (since the previous reading
// of relations makes pmadb the current one, maybe depending on the MySQL version)
PMA_DBI_select_db($db);
if ($cfgRelation['relwork']) { if ($cfgRelation['relwork']) {
$existrel = PMA_getForeigners($db, $table, '', 'internal'); $existrel = PMA_getForeigners($db, $table, '', 'internal');
} }
if ($tbl_type=='INNODB') { if ($tbl_type == 'INNODB') {
$existrel_innodb = PMA_getForeigners($db, $table, '', 'innodb'); $existrel_innodb = PMA_getForeigners($db, $table, '', 'innodb');
} }
if ($cfgRelation['displaywork']) { if ($cfgRelation['displaywork']) {
@@ -88,10 +94,13 @@ if ($cfgRelation['displaywork']) {
// u p d a t e s f o r I n t e r n a l r e l a t i o n s // u p d a t e s f o r I n t e r n a l r e l a t i o n s
if (isset($destination) && $cfgRelation['relwork']) { if (isset($destination) && $cfgRelation['relwork']) {
foreach ($destination AS $master_field => $foreign_string) { foreach ($destination as $master_field => $foreign_string) {
if ($foreign_string != 'nix') { $upd_query = false;
list($foreign_db, $foreign_table, $foreign_field) = explode('.', $foreign_string); if (! empty($foreign_string)) {
if (!isset($existrel[$master_field])) { $foreign_string = trim($foreign_string, '`');
list($foreign_db, $foreign_table, $foreign_field) =
explode('`.`', $foreign_string);
if (! isset($existrel[$master_field])) {
$upd_query = 'INSERT INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['relation']) $upd_query = 'INSERT INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['relation'])
. '(master_db, master_table, master_field, foreign_db, foreign_table, foreign_field)' . '(master_db, master_table, master_field, foreign_db, foreign_table, foreign_field)'
. ' values(' . ' values('
@@ -116,9 +125,8 @@ if (isset($destination) && $cfgRelation['relwork']) {
. ' AND master_table = \'' . PMA_sqlAddslashes($table) . '\'' . ' AND master_table = \'' . PMA_sqlAddslashes($table) . '\''
. ' AND master_field = \'' . PMA_sqlAddslashes($master_field) . '\''; . ' AND master_field = \'' . PMA_sqlAddslashes($master_field) . '\'';
} // end if... else.... } // end if... else....
if (isset($upd_query)) { if ($upd_query) {
$upd_rs = PMA_query_as_cu($upd_query); PMA_query_as_cu($upd_query);
unset($upd_query);
} }
} // end while } // end while
} // end if (updates for internal relations) } // end if (updates for internal relations)
@@ -133,8 +141,10 @@ if (isset($_REQUEST['destination_innodb'])) {
$display_query = ''; $display_query = '';
$seen_error = false; $seen_error = false;
foreach ($_REQUEST['destination_innodb'] as $master_field => $foreign_string) { foreach ($_REQUEST['destination_innodb'] as $master_field => $foreign_string) {
if ($foreign_string != 'nix') { if (! empty($foreign_string)) {
list($foreign_db, $foreign_table, $foreign_field) = explode('.', $foreign_string); $foreign_string = trim($foreign_string, '`');
list($foreign_db, $foreign_table, $foreign_field) =
explode('`.`', $foreign_string);
if (!isset($existrel_innodb[$master_field])) { if (!isset($existrel_innodb[$master_field])) {
// no key defined for this field // no key defined for this field
@@ -152,11 +162,11 @@ if (isset($_REQUEST['destination_innodb'])) {
. PMA_backquote($foreign_table) . '(' . PMA_backquote($foreign_table) . '('
. PMA_backquote($foreign_field) . ')'; . PMA_backquote($foreign_field) . ')';
if ($_REQUEST['on_delete'][$master_field] != 'nix') { if (! empty($_REQUEST['on_delete'][$master_field])) {
$sql_query .= ' ON DELETE ' . $options_array[$_REQUEST['on_delete'][$master_field]]; $sql_query .= ' ON DELETE ' . $options_array[$_REQUEST['on_delete'][$master_field]];
} }
if ($_REQUEST['on_update'][$master_field] != 'nix') { if (! empty($_REQUEST['on_update'][$master_field])) {
$sql_query .= ' ON UPDATE ' . $options_array[$_REQUEST['on_update'][$master_field]]; $sql_query .= ' ON UPDATE ' . $options_array[$_REQUEST['on_update'][$master_field]];
} }
$sql_query .= ';'; $sql_query .= ';';
$display_query .= $sql_query . "\n"; $display_query .= $sql_query . "\n";
@@ -176,7 +186,7 @@ if (isset($_REQUEST['destination_innodb'])) {
. PMA_backquote($existrel_innodb[$master_field]['constraint']) . ';'; . PMA_backquote($existrel_innodb[$master_field]['constraint']) . ';';
// I tried to send both in one query but it failed // I tried to send both in one query but it failed
$upd_rs = PMA_DBI_query($sql_query); PMA_DBI_query($sql_query);
$display_query .= $sql_query . "\n"; $display_query .= $sql_query . "\n";
// add another // add another
@@ -209,7 +219,7 @@ if (isset($_REQUEST['destination_innodb'])) {
} // end if... else.... } // end if... else....
if (! empty($sql_query)) { if (! empty($sql_query)) {
$upd_rs = PMA_DBI_try_query($sql_query); PMA_DBI_try_query($sql_query);
$tmp_error = PMA_DBI_getError(); $tmp_error = PMA_DBI_getError();
if (! empty($tmp_error)) { if (! empty($tmp_error)) {
$seen_error = true; $seen_error = true;
@@ -241,9 +251,8 @@ if (isset($_REQUEST['destination_innodb'])) {
// U p d a t e s f o r d i s p l a y f i e l d // 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'] if ($cfgRelation['displaywork'] && isset($display_field)) {
&& isset($display_field)) { $upd_query = false;
if ($disp) { if ($disp) {
if ($display_field != '') { if ($display_field != '') {
$upd_query = 'UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_info']) $upd_query = 'UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_info'])
@@ -264,8 +273,8 @@ if ($cfgRelation['displaywork']
. '\'' . PMA_sqlAddslashes($display_field) . '\')'; . '\'' . PMA_sqlAddslashes($display_field) . '\')';
} }
if (isset($upd_query)) { if ($upd_query) {
$upd_rs = PMA_query_as_cu($upd_query); PMA_query_as_cu($upd_query);
} }
} // end if } // end if
@@ -293,92 +302,35 @@ echo PMA_generate_common_hidden_inputs($db, $table);
// relations // relations
if ($cfgRelation['relwork'] || $tbl_type=='INNODB') { if ($cfgRelation['relwork'] || $tbl_type == 'INNODB') {
// To choose relations we first need all tables names in current db // To choose relations we first need all tables names in current db
// and if PMA version permits and the main table is innodb, // and if PMA version permits and the main table is innodb,
// we use SHOW TABLE STATUS because we need to find other InnoDB tables // we use SHOW TABLE STATUS because we need to find other InnoDB tables
if ($tbl_type=='INNODB') { if ($tbl_type == 'INNODB') {
$tab_query = 'SHOW TABLE STATUS FROM ' . PMA_backquote($db); $tab_query = 'SHOW TABLE STATUS FROM ' . PMA_backquote($db);
// [0] of the row is the name // [0] of the row is the name
// [1] is the type // [1] is the type
} else { } else {
$tab_query = 'SHOW TABLES FROM ' . PMA_backquote($db); $tab_query = 'SHOW TABLES FROM ' . PMA_backquote($db);
// [0] of the row is the name
} }
// [0] of the row is the name
$tab_rs = PMA_DBI_query($tab_query, null, PMA_DBI_QUERY_STORE); $tab_rs = PMA_DBI_query($tab_query, null, PMA_DBI_QUERY_STORE);
$selectboxall['nix'] = '--'; $selectboxall[] = '';
$selectboxall_innodb['nix'] = '--'; $selectboxall_innodb[] = '';
while ($curr_table = @PMA_DBI_fetch_row($tab_rs)) { while ($curr_table = PMA_DBI_fetch_row($tab_rs)) {
if (($curr_table[0] != $table) && ($curr_table[0] != $cfg['Server']['relation'])) { $current_table = new PMA_Table($curr_table[0], $db);
PMA_DBI_select_db($db);
// need to use PMA_DBI_QUERY_STORE with PMA_DBI_num_rows() in mysqli $selectboxall = array_merge($selectboxall, $current_table->getUniqueColumns());
$fi_rs = PMA_DBI_query('SHOW KEYS FROM ' . PMA_backquote($curr_table[0]) . ';', null, PMA_DBI_QUERY_STORE);
if ($fi_rs && PMA_DBI_num_rows($fi_rs) > 0) {
$seen_a_primary = FALSE;
while ($curr_field = PMA_DBI_fetch_assoc($fi_rs)) {
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_v = $curr_field['Table'] . '->' . $curr_field['Column_name'];
$selectboxall[$field_full] = $field_v;
// there could be more than one segment of the primary
// so do not break
// Please watch here, tbl_type is INNODB but the if ($tbl_type == 'INNODB'
// resulting value of SHOW KEYS is InnoDB && isset($curr_table[1])
&& $curr_table[1] == 'InnoDB') {
if ($tbl_type=='INNODB' && isset($curr_table[1]) && $curr_table[1]=='InnoDB') { $selectboxall_innodb = array_merge($selectboxall_innodb, $current_table->getIndexedColumns());
$selectboxall_innodb[$field_full] = $field_v;
}
} elseif (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
// (in fact, we show all segments of unique keys
// and all unique keys)
$field_full = $db . '.' . $curr_field['Table'] . '.' . $curr_field['Column_name'];
$field_v = $curr_field['Table'] . '->' . $curr_field['Column_name'];
$selectboxall[$field_full] = $field_v;
if ($tbl_type=='INNODB' && isset($curr_table[1]) && $curr_table[1]=='InnoDB') {
$selectboxall_innodb[$field_full] = $field_v;
}
// for InnoDB, any index is allowed
} elseif ($tbl_type=='INNODB' && isset($curr_table[1]) && $curr_table[1]=='InnoDB') {
$field_full = $db . '.' . $curr_field['Table'] . '.' . $curr_field['Column_name'];
$field_v = $curr_field['Table'] . '->' . $curr_field['Column_name'];
$selectboxall_innodb[$field_full] = $field_v;
} // end if
} // end while over keys
} // end if (PMA_DBI_num_rows)
PMA_DBI_free_result($fi_rs);
unset($fi_rs);
// Mike Beck - 24.07.02: i've been asked to add all keys of the
// current table (see bug report #574851)
} elseif ($curr_table[0] == $table) {
PMA_DBI_select_db($db);
// need to use PMA_DBI_QUERY_STORE with PMA_DBI_num_rows() in mysqli
$fi_rs = PMA_DBI_query('SHOW KEYS FROM ' . PMA_backquote($curr_table[0]) . ';', null, PMA_DBI_QUERY_STORE);
if ($fi_rs && PMA_DBI_num_rows($fi_rs) > 0) {
while ($curr_field = PMA_DBI_fetch_assoc($fi_rs)) {
$field_full = $db . '.' . $curr_field['Table'] . '.' . $curr_field['Column_name'];
$field_v = $curr_field['Table'] . '->' . $curr_field['Column_name'];
$selectboxall[$field_full] = $field_v;
if ($tbl_type=='INNODB' && isset($curr_table[1]) && $curr_table[1]=='InnoDB') {
$selectboxall_innodb[$field_full] = $field_v;
}
} // end while
} // end if (PMA_DBI_num_rows)
PMA_DBI_free_result($fi_rs);
unset($fi_rs);
} }
} // end while over tables } // end while over tables
} // end if } // end if
@@ -433,14 +385,14 @@ if ($col_rs && PMA_DBI_num_rows($col_rs) > 0) {
$foreign_field = FALSE; $foreign_field = FALSE;
} }
$seen_key = FALSE; $seen_key = FALSE;
foreach ($selectboxall AS $key => $value) { foreach ($selectboxall as $value) {
echo ' ' echo ' '
. '<option value="' . htmlspecialchars($key) . '"'; . '<option value="' . htmlspecialchars($value) . '"';
if ($foreign_field && $key == $foreign_field) { if ($foreign_field && $value == $foreign_field) {
echo ' selected="selected"'; echo ' selected="selected"';
$seen_key = TRUE; $seen_key = TRUE;
} }
echo '>' . $value . '</option>'. "\n"; echo '>' . htmlspecialchars($value) . '</option>'. "\n";
} // end while } // end while
// if the link defined in relationtable points to a foreign field // if the link defined in relationtable points to a foreign field
@@ -474,14 +426,14 @@ if ($col_rs && PMA_DBI_num_rows($col_rs) > 0) {
} }
$found_foreign_field = FALSE; $found_foreign_field = FALSE;
foreach ($selectboxall_innodb AS $key => $value) { foreach ($selectboxall_innodb as $value) {
echo ' ' echo ' '
. '<option value="' . htmlspecialchars($key) . '"'; . '<option value="' . htmlspecialchars($value) . '"';
if ($foreign_field && $key == $foreign_field) { if ($foreign_field && $value == $foreign_field) {
echo ' selected="selected"'; echo ' selected="selected"';
$found_foreign_field = TRUE; $found_foreign_field = TRUE;
} }
echo '>' . $value . '</option>'. "\n"; echo '>' . htmlspecialchars($value) . '</option>'. "\n";
} // end while } // end while
// we did not find the foreign field in the tables of current db, // we did not find the foreign field in the tables of current db,
@@ -499,7 +451,7 @@ if ($col_rs && PMA_DBI_num_rows($col_rs) > 0) {
<span class="formelement"> <span class="formelement">
<?php <?php
PMA_generate_dropdown('ON DELETE', PMA_generate_dropdown('ON DELETE',
'on_delete[' . htmlspecialchars($save_row[$i]['Field']) . ']', 'on_delete[' . $save_row[$i]['Field'] . ']',
$options_array, $options_array,
isset($existrel_innodb[$myfield]['on_delete']) ? $existrel_innodb[$myfield]['on_delete']: ''); isset($existrel_innodb[$myfield]['on_delete']) ? $existrel_innodb[$myfield]['on_delete']: '');
@@ -507,7 +459,7 @@ if ($col_rs && PMA_DBI_num_rows($col_rs) > 0) {
.'<span class="formelement">' . "\n"; .'<span class="formelement">' . "\n";
PMA_generate_dropdown('ON UPDATE', PMA_generate_dropdown('ON UPDATE',
'on_update[' . htmlspecialchars($save_row[$i]['Field']) . ']', 'on_update[' . $save_row[$i]['Field'] . ']',
$options_array, $options_array,
isset($existrel_innodb[$myfield]['on_update']) ? $existrel_innodb[$myfield]['on_update']: ''); isset($existrel_innodb[$myfield]['on_update']) ? $existrel_innodb[$myfield]['on_update']: '');
echo '</span>' . "\n"; echo '</span>' . "\n";