diff --git a/ChangeLog b/ChangeLog index 294b975b5..fbe855284 100755 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,9 @@ $Id$ $Source$ +2002-11-02 Alexander M. Turek + * db_datadict.php3: Fixed bug #632515 (JS error in data dictonary). + 2002-11-01 Marc Delisle * libraries/sqlparser.lib.php3, libraries/display_tbl.lib.php3, sql.php3: analyzer for db, table, column, alias, with additional diff --git a/db_datadict.php3 b/db_datadict.php3 index 4f577c346..f6892d8a1 100644 --- a/db_datadict.php3 +++ b/db_datadict.php3 @@ -1,5 +1,4 @@ "; } echo '

' . $table . '

' . "\n"; - + /** * Gets table informations */ @@ -76,8 +75,8 @@ while ($row=mysql_fetch_array($rowset)) { if ($result) { mysql_free_result($result); } - - + + /** * Gets table keys and retains them */ @@ -109,31 +108,31 @@ while ($row=mysql_fetch_array($rowset)) { // I don't know what does following column mean.... // $indexes_info[$row['Key_name']]['Packed'] = $row['Packed']; $indexes_info[$row['Key_name']]['Comment'] = $row['Comment']; - + $indexes_data[$row['Key_name']][$row['Seq_in_index']]['Column_name'] = $row['Column_name']; if (isset($row['Sub_part'])) { $indexes_data[$row['Key_name']][$row['Seq_in_index']]['Sub_part'] = $row['Sub_part']; } - + } // end while if ($result) { mysql_free_result($result); } - - + + /** * Gets fields properties */ $local_query = 'SHOW FIELDS FROM ' . PMA_backquote($table); $result = PMA_mysql_query($local_query) or PMA_mysqlDie('', $local_query, '', $err_url); $fields_cnt = mysql_num_rows($result); - + // Check if we can use Relations (Mike Beck) if (!empty($cfgRelation['relation'])) { // Find which tables are related with the current one and write it in // an array $res_rel = PMA_getForeigners($db, $table); - + if (count($res_rel) > 0) { $have_rel = TRUE; } else { @@ -143,20 +142,20 @@ while ($row=mysql_fetch_array($rowset)) { else { $have_rel = FALSE; } // end if - - + + /** * Displays the comments of the table if MySQL >= 3.23 */ if (!empty($show_comment)) { echo $strTableComments . ' : ' . $show_comment . '

'; } - + /** * Displays the table structure */ ?> - + @@ -176,13 +175,13 @@ while ($row=mysql_fetch_array($rowset)) { } ?> - + '; - if (isset($res_rel[$field_name])) { + if (isset($res_rel[$field_name])) { echo htmlspecialchars($res_rel[$field_name]['foreign_table'] . ' -> ' . $res_rel[$field_name]['foreign_field'] ); } echo ' ' . "\n"; @@ -259,13 +258,13 @@ while ($row=mysql_fetch_array($rowset)) {
' . "\n"; - - + + $count++; }//ends main while /** @@ -276,14 +275,15 @@ echo '

  +