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

enable Relation view for InnoDB even if the internal infrastructure is not available

Browse Source
This commit is contained in:
Marc Delisle
2004-06-17 11:13:14 +00:00
parent 13a9f1460c
commit 1142f3cbed
2 changed files with 95 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tbl_properties_structure.php
View File

@@ -450,7 +450,10 @@ if ($cfg['PropertiesIconic']) {
?></a>&nbsp;&nbsp;
<?php
if ($cfg['Server']['relation']) {
// if internal relations are available, or the table type is INNODB
// ($tbl_type comes from tbl_properties_table_info.php)
if ($cfg['Server']['relation'] || $tbl_type=="INNODB") {
?>
<!-- Work on Relations -->
<a href="tbl_relation.php?<?php echo $url_query; ?>"><?php

38
tbl_relation.php
View File

@@ -12,7 +12,7 @@ $url_query .= '&amp;goto=tbl_properties.php';
// Note: in tbl_properties_table_info we get and display the table comment.
// For InnoDB, this comment contains the REFER information but any update
// has not been done yet (will be done in tbl_relation later).
// has not been done yet (will be done in tbl_relation.php later).
$avoid_show_comment = TRUE;
require('./tbl_properties_table_info.php');
require_once('./libraries/relation.lib.php');
@@ -64,17 +64,18 @@ $cfgRelation = PMA_getRelationsParam();
if ($cfgRelation['relwork']) {
$existrel = PMA_getForeigners($db, $table, '', 'internal');
}
if ($tbl_type=='INNODB') {
$existrel_innodb = PMA_getForeigners($db, $table, '', 'innodb');
}
}
if ($cfgRelation['displaywork']) {
$disp = PMA_getDisplayField($db, $table);
}
if ($cfgRelation['relwork']
&& isset($submit_rel) && $submit_rel == 'true') {
// updates for internal relations or innodb?
if (isset($submit_rel) && $submit_rel == 'true') {
// 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 ($cfgRelation['relwork']) {
foreach ($destination AS $master_field => $foreign_string) {
if ($foreign_string != 'nix') {
@@ -109,10 +110,10 @@ if ($cfgRelation['relwork']
unset($upd_query);
}
} // end while
} // end if (updates for internal relations)
// u p d a t e s f o r I n n o D B
// ( for now, one index name; we keep the definitions if the
// ( for now, one index name only; we keep the definitions if the
// foreign db is not the same)
if (isset($destination_innodb)) {
foreach ($destination_innodb AS $master_field => $foreign_string) {
@@ -197,7 +198,7 @@ if ($cfgRelation['relwork']
} // end while
} // end if isset($destination_innodb)
} // end if
} // end if (updates for internal relations or InnoDB)
// U p d a t e s f o r d i s p l a y f i e l d
@@ -239,9 +240,10 @@ if ($cfgRelation['commwork']
} // end if (commwork)
// If we did an update, refresh our data
if ($cfgRelation['relwork']
&& isset($submit_rel) && $submit_rel == 'true') {
if (isset($submit_rel) && $submit_rel == 'true') {
if ($cfgRelation['relwork']) {
$existrel = PMA_getForeigners($db, $table, '', 'internal');
}
if ($tbl_type=='INNODB') {
$existrel_innodb = PMA_getForeigners($db, $table, '', 'innodb');
}
@@ -257,7 +259,7 @@ if ($cfgRelation['commwork']) {
/**
* Dialog
*/
if ($cfgRelation['relwork']) {
if ($cfgRelation['relwork'] || $tbl_type=='INNODB') {
// To choose relations we first need all tables names in current db
// and if PMA version permits and the main table is innodb,
@@ -360,12 +362,15 @@ if ($col_rs && PMA_DBI_num_rows($col_rs) > 0) {
<th colspan="<?php echo $tbl_type=='INNODB' ? '4' : '2'; ?>" align="center" class="tblHeaders"><b><?php echo $strLinksTo; ?></b></th>
</tr>
<tr>
<th></th><th><b><?php echo $strInternalRelations;
<th></th>
<?php
if ($cfgRelation['relwork']) {
echo ' <th><b>' .$strInternalRelations;
if ($tbl_type=='INNODB') {
echo '&nbsp;(*)';
}
?></b></th>
<?php
echo '</b></th>';
}
if ($tbl_type=='INNODB') {
echo '<th colspan="2">InnoDB';
if (PMA_MYSQL_INT_VERSION < 40013) {
@@ -382,6 +387,9 @@ if ($col_rs && PMA_DBI_num_rows($col_rs) > 0) {
?>
<tr>
<td align="center" bgcolor="<?php echo ($i % 2) ? $GLOBALS['cfg']['BgcolorOne'] : $GLOBALS['cfg']['BgcolorTwo']; ?>"><b><?php echo $save_row[$i]['Field']; ?></b></td>
<?php
if ($cfgRelation['relwork']) {
?>
<td bgcolor="<?php echo ($i % 2) ? $GLOBALS['cfg']['BgcolorOne'] : $GLOBALS['cfg']['BgcolorTwo']; ?>">
<select name="destination[<?php echo htmlspecialchars($save_row[$i]['Field']); ?>]">
<?php
@@ -419,6 +427,8 @@ if ($col_rs && PMA_DBI_num_rows($col_rs) > 0) {
</select>
</td>
<?php
} // end if (internal relations)
if ($tbl_type=='INNODB') {
?>
<td bgcolor="<?php echo ($i % 2) ? $GLOBALS['cfg']['BgcolorOne'] : $GLOBALS['cfg']['BgcolorTwo']; ?>">
@@ -486,7 +496,9 @@ if ($col_rs && PMA_DBI_num_rows($col_rs) > 0) {
</table>
<?php
if ($tbl_type=='INNODB') {
if ($cfgRelation['relwork']) {
echo $strInternalNotNecessary . '<br />';
}
if (PMA_MYSQL_INT_VERSION < 40013) {
echo '** ' . sprintf($strUpgrade, 'MySQL', '4.0.13') . '<br />';
}