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

bug #1982315 [GUI] Comma and quote in ENUM, thanks to Joshua Hogendorn

Browse Source
This commit is contained in:
Marc Delisle
2008-07-05 22:01:04 +00:00
parent 8f77ea79b1
commit 1ce9daf87c
5 changed files with 97 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tbl_structure.php
View File

@@ -212,13 +212,10 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
$aryFields[] = $row['Field'];
$type = $row['Type'];
$type_and_length = PMA_extract_type_length($row['Type']);
$extracted_fieldspec = PMA_extractFieldSpec($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)) {
$tmp[2] = substr(preg_replace('@([^,])\'\'@', '\\1\\\'', ',' . $tmp[2]), 1);
$type = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')';
if ('set' == $extracted_fieldspec['type'] || 'enum' == $extracted_fieldspec['type']) {
$type = $extracted_fieldspec['type'] . '(' . $extracted_fieldspec['spec_in_brackets'] . ')';
// for the case ENUM('–','“')
$type = htmlspecialchars($type);
@@ -339,8 +336,8 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
<td><?php echo (($row['Null'] == 'YES') ? $strYes : $strNo); ?></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']);
if ($extracted_fieldspec['type'] == 'bit') {
echo PMA_printable_bit_value($row['Default'], $extracted_fieldspec['spec_in_brackets']);
} else {
echo $row['Default'];
}