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

added method PMA_getRowDataForFieldsMetaSet

Browse Source
This commit is contained in:
Spun Nakandala 2013-08-05 11:41:32 +05:30
parent ca2cc11bce
commit e636a19206
2 changed files with 43 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libraries/tbl_columns_definition_form.inc.php
View File

@ -89,35 +89,10 @@ for ($i = 0; $i < $num_fields; $i++) {
$comments_map, $mime_map
);
} elseif (isset($fields_meta[$i])) {
$row = $fields_meta[$i];
switch ($row['Default']) {
case null:
if ($row['Null'] == 'YES') {
$row['DefaultType'] = 'NULL';
$row['DefaultValue'] = '';
// SHOW FULL COLUMNS does not report the case
// when there is a DEFAULT value which is empty so we need to use the
// results of SHOW CREATE TABLE
} elseif (isset($row)
&& isset($analyzed_sql[0]['create_table_fields'][$row['Field']]
['default_value'])
) {
$row['DefaultType'] = 'USER_DEFINED';
$row['DefaultValue'] = $row['Default'];
} else {
$row['DefaultType'] = 'NONE';
$row['DefaultValue'] = '';
}
break;
case 'CURRENT_TIMESTAMP':
$row['DefaultType'] = 'CURRENT_TIMESTAMP';
$row['DefaultValue'] = '';
break;
default:
$row['DefaultType'] = 'USER_DEFINED';
$row['DefaultValue'] = $row['Default'];
break;
}
$row = PMA_getRowDataForFieldsMetaSet(
$fields_meta[$i], isset($analyzed_sql[0]['create_table_fields']
[$row['Field']]['default_value'])
);
}
if (isset($row['Type'])) {

39
libraries/tbl_columns_definition_form.lib.php
View File

@ -507,4 +507,43 @@ function PMA_handleRegeneration($submit_fulltext, $comments_map, $mime_map)
$comments_map, $mime_map
);
}
/**
* Function to get row data for $fields_meta set
*
* @param array $row row
* @param bool $isDefault whether the row value is default
*
* @return array
*/
function PMA_getRowDataForFieldsMetaSet($row, $isDefault)
{
switch ($row['Default']) {
case null:
if ($row['Null'] == 'YES') {
$row['DefaultType'] = 'NULL';
$row['DefaultValue'] = '';
// SHOW FULL COLUMNS does not report the case
// when there is a DEFAULT value which is empty so we need to use the
// results of SHOW CREATE TABLE
} elseif ($isDefault) {
$row['DefaultType'] = 'USER_DEFINED';
$row['DefaultValue'] = $row['Default'];
} else {
$row['DefaultType'] = 'NONE';
$row['DefaultValue'] = '';
}
break;
case 'CURRENT_TIMESTAMP':
$row['DefaultType'] = 'CURRENT_TIMESTAMP';
$row['DefaultValue'] = '';
break;
default:
$row['DefaultType'] = 'USER_DEFINED';
$row['DefaultValue'] = $row['Default'];
break;
}
return $row;
}
?>