bug #1926357 [data] BIT defaults displayed incorrectly

This commit is contained in:
Marc Delisle
2008-04-02 17:19:59 +00:00
parent 87e6dd4689
commit b9b38d39f9
6 changed files with 74 additions and 19 deletions

View File

@@ -252,6 +252,8 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
$aryFields[] = $row['Field'];
$type = $row['Type'];
$type_and_length = PMA_extract_type_length($row['Type']);
// reformat mysql query output - staybyte - 9. June 2001
// loic1: set or enum types: slashes single quotes inside options
if (preg_match('@^(set|enum)\((.+)\)$@i', $type, $tmp)) {
@@ -378,7 +380,14 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
<?php echo PMA_MYSQL_INT_VERSION >= 40100 ? ' <td>' . (empty($field_charset) ? '' : '<dfn title="' . PMA_getCollationDescr($field_charset) . '">' . $field_charset . '</dfn>') . '</td>' . "\n" : '' ?>
<td nowrap="nowrap" style="font-size: 70%"><?php echo $attribute; ?></td>
<td><?php echo (($row['Null'] == 'YES') ? $strYes : $strNo); ?></td>
<td nowrap="nowrap"><?php if (isset($row['Default'])) { echo $row['Default']; } ?></td>
<td nowrap="nowrap"><?php
if (isset($row['Default'])) {
if ($type_and_length['type'] == 'bit') {
echo PMA_printable_bit_value($row['Default'], $type_and_length['length']);
} else {
echo $row['Default'];
}
} ?></td>
<td nowrap="nowrap"><?php echo $row['Extra']; ?></td>
<td align="center">
<a href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('SELECT COUNT(*) AS ' . PMA_backquote($strRows) . ', ' . PMA_backquote($row['Field']) . ' FROM ' . PMA_backquote($table) . ' GROUP BY ' . PMA_backquote($row['Field']) . ' ORDER BY ' . PMA_backquote($row['Field'])); ?>">