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

Fix including column names.

Browse Source
This commit is contained in:
Michal Čihař
2006-04-28 08:51:35 +00:00
parent 5ec84ee7f8
commit 02ff4b83d3
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -11,6 +11,7 @@ $Source$
* Documentation.html, main.php, libraries/left_header.inc.php: * Documentation.html, main.php, libraries/left_header.inc.php:
Customizable link under left logo (RFE #1111599). Customizable link under left logo (RFE #1111599).
* libraries/export/htmlword.php: Fix including column names. * libraries/export/htmlword.php: Fix including column names.
* libraries/export/latex.php: Add missing crlf, remove unused code.
2006-04-27 Sebastian Mendel <cybot_tm@users.sourceforge.net> 2006-04-27 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* db_printview.php: fixed bug 'no tables found', refactored * db_printview.php: fixed bug 'no tables found', refactored

16
libraries/export/latex.php
View File

@@ -34,7 +34,7 @@ if (isset($plugin_list)) {
$plugin_list['latex']['options'][] = $plugin_list['latex']['options'][] =
array('type' => 'bool', 'name' => 'relation', 'text' => 'strRelations'); array('type' => 'bool', 'name' => 'relation', 'text' => 'strRelations');
} }
if (!empty($GLOBALS['cfgRelation']['commwork']) && PMA_MYSQL_INT_VERSION < 40100) { if (!empty($GLOBALS['cfgRelation']['commwork']) || PMA_MYSQL_INT_VERSION >= 40100) {
$plugin_list['latex']['options'][] = $plugin_list['latex']['options'][] =
array('type' => 'bool', 'name' => 'comments', 'text' => 'strComments'); array('type' => 'bool', 'name' => 'comments', 'text' => 'strComments');
} }
@@ -339,7 +339,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
$columns_cnt++; $columns_cnt++;
$alignment .= 'l|'; $alignment .= 'l|';
} }
if ($do_comments && $cfgRelation['commwork']) { if ($do_comments && ($cfgRelation['commwork'] || PMA_MYSQL_INT_VERSION >= 40100)) {
$columns_cnt++; $columns_cnt++;
$alignment .= 'l|'; $alignment .= 'l|';
} }
@@ -377,7 +377,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
$buffer .= ' \\caption{'. str_replace('__TABLE__', PMA_texEscape($table), $GLOBALS['latex_structure_continued_caption']) $buffer .= ' \\caption{'. str_replace('__TABLE__', PMA_texEscape($table), $GLOBALS['latex_structure_continued_caption'])
. '} \\\\ ' . $crlf; . '} \\\\ ' . $crlf;
} }
$buffer .= $header . ' \\\\ \\hline \\hline \\endhead \\endfoot '; $buffer .= $header . ' \\\\ \\hline \\hline \\endhead \\endfoot ' . $crlf;
if (!PMA_exportOutputHandler($buffer)) { if (!PMA_exportOutputHandler($buffer)) {
return FALSE; return FALSE;
@@ -409,16 +409,6 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
$unsigned = eregi('UNSIGNED', $row['Type']); $unsigned = eregi('UNSIGNED', $row['Type']);
$zerofill = eregi('ZEROFILL', $row['Type']); $zerofill = eregi('ZEROFILL', $row['Type']);
} }
$strAttribute = '&nbsp;';
if ($binary) {
$strAttribute = 'BINARY';
}
if ($unsigned) {
$strAttribute = 'UNSIGNED';
}
if ($zerofill) {
$strAttribute = 'UNSIGNED ZEROFILL';
}
if (!isset($row['Default'])) { if (!isset($row['Default'])) {
if ($row['Null'] != '') { if ($row['Null'] != '') {
$row['Default'] = 'NULL'; $row['Default'] = 'NULL';