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

Use native MySQL comments when applicable (RFE #1362923).

Browse Source
This commit is contained in:
Michal Čihař
2005-11-23 22:13:18 +00:00
parent 19f21606d3
commit 42d5ca744b
8 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -78,6 +78,10 @@ $Source$
default (RFE #1228013).
* db_details_structure.php, left.php, tbl_properties_links.php: Do not
pass default query to sql.php as it is not needed right now.
* tbl_change.php, tbl_printview.php, tbl_properties.inc.php,
tbl_properties_structure.php, libraries/display_tbl.lib.php,
libraries/export/htmlword.php, libraries/export/latex.php: Use native
MySQL comments when applicable (RFE #1362923).
2005-11-22 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* added test/theme.php: for testing themes

2
libraries/display_tbl.lib.php
View File

@@ -664,7 +664,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
// 2.0.1 Prepare Display column comments if enabled ($GLOBALS['cfg']['ShowBrowseComments']).
// Do not show comments, if using horizontalflipped mode, because of space usage
if ($GLOBALS['cfg']['ShowBrowseComments'] && $GLOBALS['cfgRelation']['commwork'] && $disp_direction != 'horizontalflipped') {
if ($GLOBALS['cfg']['ShowBrowseComments'] && ($GLOBALS['cfgRelation']['commwork'] || PMA_MYSQL_INT_VERSION >= 40100) && $disp_direction != 'horizontalflipped') {
$comments_map = array();
foreach ($analyzed_sql[0]['table_ref'] as $tbl) {

2
libraries/export/htmlword.php
View File

@@ -208,7 +208,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
if ($do_relation && $have_rel) {
$schema_insert .= '<td class="print"><b>' . htmlspecialchars($GLOBALS['strLinksTo']) . '</b></td>';
}
if ($do_comments && $cfgRelation['commwork']) {
if ($do_comments && ($cfgRelation['commwork'] || PMA_MYSQL_INT_VERSION >= 40100)) {
$schema_insert .= '<td class="print"><b>' . htmlspecialchars($GLOBALS['strComments']) . '</b></td>';
$comments = PMA_getComments($db, $table);
}

2
libraries/export/latex.php
View File

@@ -283,7 +283,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
if ($do_relation && $have_rel) {
$header .= ' & \\multicolumn{1}{|c|}{\\textbf{' . $GLOBALS['strLinksTo'] . '}}';
}
if ($do_comments && $cfgRelation['commwork']) {
if ($do_comments && ($cfgRelation['commwork'] || PMA_MYSQL_INT_VERSION >= 40100)) {
$header .= ' & \\multicolumn{1}{|c|}{\\textbf{' . $GLOBALS['strComments'] . '}}';
$comments = PMA_getComments($db, $table);
}

2
tbl_change.php
View File

@@ -84,7 +84,7 @@ if ($GLOBALS['cfg']['ShowPropertyComments']) {
$cfgRelation = PMA_getRelationsParam();
if ($cfgRelation['commwork']) {
if ($cfgRelation['commwork'] || PMA_MYSQL_INT_VERSION >= 40100) {
$comments_map = PMA_getComments($db, $table);
}
}

2
tbl_printview.php
View File

@@ -231,7 +231,7 @@ foreach ($the_tables AS $key => $table) {
}
echo '&nbsp;</td>' . "\n";
}
if ($cfgRelation['commwork']) {
if ($cfgRelation['commwork'] || PMA_MYSQL_INT_VERSION >= 40100) {
echo ' <td class="print">';
$comments = PMA_getComments($db, $table);
if (isset($comments[$field_name])) {

4
tbl_properties.inc.php
View File

@@ -142,7 +142,7 @@ $comments_map = array();
$mime_map = array();
$available_mime = array();
if ($cfgRelation['commwork']) {
if ($cfgRelation['commwork'] || PMA_MYSQL_INT_VERSION >= 40100) {
$comments_map = PMA_getComments($db, $table);
$header_cells[] = $strComments;
@@ -502,7 +502,7 @@ for ( $i = 0 ; $i <= $num_fields; $i++ ) {
} // end if ($action ==...)
// garvin: comments
if ($cfgRelation['commwork']) {
if ($cfgRelation['commwork'] || PMA_MYSQL_INT_VERSION >= 40100) {
$content_cells[$i][$ci] = '<input id="field_' . $i . '_' . ($ci - $ci_offset) . '" type="text" name="field_comments[]" size="12" value="' . (isset($row) && isset($row['Field']) && is_array($comments_map) && isset($comments_map[$row['Field']]) ? htmlspecialchars($comments_map[$row['Field']]) : '') . '" class="textfield" />';
$ci++;
}

2
tbl_properties_structure.php
View File

@@ -192,7 +192,7 @@ if ($GLOBALS['cfg']['ShowPropertyComments']) {
$cfgRelation = PMA_getRelationsParam();
if ($cfgRelation['commwork']) {
if ($cfgRelation['commwork'] || PMA_MYSQL_INT_VERSION >= 40100) {
$comments_map = PMA_getComments($db, $table);
if ($cfgRelation['mimework'] && $cfg['BrowseMIME']) {