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

innodb and pdf schema

Browse Source
This commit is contained in:
Marc Delisle
2003-06-20 19:25:48 +00:00
parent 531ad328fe
commit f5d035644e
2 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2003-06-20 Marc Delisle <lem9@users.sourceforge.net>
* pdf_schema.php3: use PMA_getForeigners()
2003-06-20 Garvin Hicking <me@supergarv.de> 2003-06-20 Garvin Hicking <me@supergarv.de>
* db_details_importdocsql.php3: Will now NEVER reveal any filename * db_details_importdocsql.php3: Will now NEVER reveal any filename
the docSQL import isn't able to read. Can now only read contents the docSQL import isn't able to read. Can now only read contents

51
pdf_schema.php3
View File

@@ -1137,6 +1137,7 @@ class PMA_RT
$alltables[] = PMA_sqlAddslashes($curr_table['table_name']); $alltables[] = PMA_sqlAddslashes($curr_table['table_name']);
$intable = '\'' . implode('\', \'', $alltables) . '\''; $intable = '\'' . implode('\', \'', $alltables) . '\'';
} }
// make doc // // make doc //
if ($with_doc) { if ($with_doc) {
$pdf->SetAutoPageBreak('auto',15); $pdf->SetAutoPageBreak('auto',15);
@@ -1187,29 +1188,47 @@ class PMA_RT
$pdf->PMA_PDF_setFontSizeScale(14); $pdf->PMA_PDF_setFontSizeScale(14);
/* start snip */ // $sql = 'SELECT * FROM ' . PMA_backquote($cfgRelation['relation'])
// . ' WHERE master_db = \'' . PMA_sqlAddslashes($db) . '\' '
// . ' AND foreign_db = \'' . PMA_sqlAddslashes($db) . '\' '
// . ' AND master_table IN (' . $intable . ')'
// . ' AND foreign_table IN (' . $intable . ')';
// $result = PMA_query_as_cu($sql);
//
// lem9:
// previous logic was checking master tables and foreign tables
// but I think that looping on every table of the pdf page as a master
// and finding its foreigns is OK (then we can support innodb)
$sql = 'SELECT * FROM ' . PMA_backquote($cfgRelation['relation']) $seen_a_relation = FALSE;
. ' WHERE master_db = \'' . PMA_sqlAddslashes($db) . '\' ' reset($alltables);
. ' AND foreign_db = \'' . PMA_sqlAddslashes($db) . '\' ' while (list(,$one_table) = each($alltables)) {
. ' AND master_table IN (' . $intable . ')'
. ' AND foreign_table IN (' . $intable . ')'; $exist_rel = PMA_getForeigners($db, $one_table, '', 'both');
$result = PMA_query_as_cu($sql); if ($exist_rel) {
$seen_a_relation = TRUE;
while (list($master_field,$rel) = each($exist_rel)) {
$this->PMA_RT_addRelation($one_table , $master_field, $rel['foreign_table'], $rel['foreign_field']);
} // end while
} // end if
} // end while
// loic1: also show tables without relations // loic1: also show tables without relations
$norelations = TRUE; // $norelations = TRUE;
if ($result && mysql_num_rows($result) > 0) { // if ($result && mysql_num_rows($result) > 0) {
$norelations = FALSE; // $norelations = FALSE;
while ($row = PMA_mysql_fetch_array($result)) { // while ($row = PMA_mysql_fetch_array($result)) {
$this->PMA_RT_addRelation($row['master_table'] , $row['master_field'], $row['foreign_table'], $row['foreign_field']); // $this->PMA_RT_addRelation($row['master_table'] , $row['master_field'], $row['foreign_table'], $row['foreign_field']);
} // }
} // }
/* end snip */
if ($norelations == FALSE) { // if ($norelations == FALSE) {
if ($seen_a_relation) {
$this->PMA_RT_drawRelations($change_color); $this->PMA_RT_drawRelations($change_color);
} }
$this->PMA_RT_drawTables($show_info); $this->PMA_RT_drawTables($show_info);
$this->PMA_RT_showRt(); $this->PMA_RT_showRt();