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

added method PMA_getHtmlForColumnAttribute

Browse Source
This commit is contained in:
Spun Nakandala 2013-08-05 22:53:17 +05:30
parent f859dfac9d
commit d8afc1f544
2 changed files with 87 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
libraries/tbl_columns_definition_form.inc.php
View File

@ -243,64 +243,14 @@ for ($i = 0; $i < $num_fields; $i++) {
$ci++;
// column attribute
$content_cells[$i][$ci] = '<select style="font-size: 70%;"'
. ' name="field_attribute[' . $i . ']"'
. ' id="field_' . $i . '_' . ($ci - $ci_offset) . '">';
$attribute = '';
if (isset($extracted_columnspec)) {
$attribute = $extracted_columnspec['attribute'];
}
if (isset($row['Extra']) && $row['Extra'] == 'on update CURRENT_TIMESTAMP') {
$attribute = 'on update CURRENT_TIMESTAMP';
}
if (isset($submit_attribute) && $submit_attribute != false) {
$attribute = $submit_attribute;
}
// here, we have a TIMESTAMP that SHOW FULL COLUMNS reports as having the
// NULL attribute, but SHOW CREATE TABLE says the contrary. Believe
// the latter.
if (PMA_MYSQL_INT_VERSION < 50025
&& isset($row['Field'])
&& isset($analyzed_sql[0]['create_table_fields'][$row['Field']]['type'])
&& $analyzed_sql[0]['create_table_fields'][$row['Field']]['type'] == 'TIMESTAMP'
&& $analyzed_sql[0]['create_table_fields'][$row['Field']]['timestamp_not_null'] == true
) {
$row['Null'] = '';
}
// MySQL 4.1.2+ TIMESTAMP options
// (if on_update_current_timestamp is set, then it's TRUE)
if (isset($row['Field'])
&& isset($analyzed_sql[0]['create_table_fields'][$row['Field']]['on_update_current_timestamp'])
) {
$attribute = 'on update CURRENT_TIMESTAMP';
}
if ((isset($row['Field'])
&& isset($analyzed_sql[0]['create_table_fields'][$row['Field']]['default_current_timestamp']))
|| (isset($submit_default_current_timestamp)
&& $submit_default_current_timestamp)
) {
$default_current_timestamp = true;
} else {
$default_current_timestamp = false;
}
$attribute_types = $GLOBALS['PMA_Types']->getAttributes();
$cnt_attribute_types = count($attribute_types);
for ($j = 0; $j < $cnt_attribute_types; $j++) {
$content_cells[$i][$ci]
.= ' <option value="' . $attribute_types[$j] . '"';
if (strtoupper($attribute) == strtoupper($attribute_types[$j])) {
$content_cells[$i][$ci] .= ' selected="selected"';
}
$content_cells[$i][$ci] .= '>' . $attribute_types[$j] . '</option>';
}
$content_cells[$i][$ci] .= '</select>';
$content_cells[$i][$ci] = PMA_getHtmlForColumnAttribute($i, $ci, $ci_offset,
isset($extracted_columnspec) ? $extracted_columnspec : null,
isset($row) ? $row : null,
isset($submit_attribute) ? $submit_attribute : null,
isset($analyzed_sql) ? $analyzed_sql : null,
isset($submit_default_current_timestamp)
? $submit_default_current_timestamp : null
);
$ci++;
// column NULL

79
libraries/tbl_columns_definition_form.lib.php
View File

@ -878,4 +878,83 @@ function PMA_getHtmlForColumnNull($i, $ci, $ci_offset, $row)
return $html;
}
/**
* Function to get html for column attribute
*
* @param int $i field number
* @param int $ci cell index
* @param int $ci_offset cell index offset
* @param array $extracted_columnspec extracted column
* @param array $row row
* @param bool $submit_attribute submit attribute
* @param array $analyzed_sql analyzed sql
* @param bool $submit_default_current_timestamp submit default current time stamp
*
* @return string
*/
function PMA_getHtmlForColumnAttribute($i, $ci, $ci_offset, $extracted_columnspec,
$row, $submit_attribute, $analyzed_sql, $submit_default_current_timestamp
) {
$html = '<select style="font-size: 70%;"'
. ' name="field_attribute[' . $i . ']"'
. ' id="field_' . $i . '_' . ($ci - $ci_offset) . '">';
$attribute = '';
if (isset($extracted_columnspec)) {
$attribute = $extracted_columnspec['attribute'];
}
if (isset($row['Extra']) && $row['Extra'] == 'on update CURRENT_TIMESTAMP') {
$attribute = 'on update CURRENT_TIMESTAMP';
}
if (isset($submit_attribute) && $submit_attribute != false) {
$attribute = $submit_attribute;
}
// here, we have a TIMESTAMP that SHOW FULL COLUMNS reports as having the
// NULL attribute, but SHOW CREATE TABLE says the contrary. Believe
// the latter.
if (PMA_MYSQL_INT_VERSION < 50025
&& isset($row['Field'])
&& isset($analyzed_sql[0]['create_table_fields'][$row['Field']]['type'])
&& $analyzed_sql[0]['create_table_fields'][$row['Field']]['type'] == 'TIMESTAMP'
&& $analyzed_sql[0]['create_table_fields'][$row['Field']]['timestamp_not_null'] == true
) {
$row['Null'] = '';
}
// MySQL 4.1.2+ TIMESTAMP options
// (if on_update_current_timestamp is set, then it's TRUE)
if (isset($row['Field'])
&& isset($analyzed_sql[0]['create_table_fields'][$row['Field']]['on_update_current_timestamp'])
) {
$attribute = 'on update CURRENT_TIMESTAMP';
}
if ((isset($row['Field'])
&& isset($analyzed_sql[0]['create_table_fields'][$row['Field']]['default_current_timestamp']))
|| (isset($submit_default_current_timestamp)
&& $submit_default_current_timestamp)
) {
$default_current_timestamp = true;
} else {
$default_current_timestamp = false;
}
$attribute_types = $GLOBALS['PMA_Types']->getAttributes();
$cnt_attribute_types = count($attribute_types);
for ($j = 0; $j < $cnt_attribute_types; $j++) {
$html
.= ' <option value="' . $attribute_types[$j] . '"';
if (strtoupper($attribute) == strtoupper($attribute_types[$j])) {
$html .= ' selected="selected"';
}
$html .= '>' . $attribute_types[$j] . '</option>';
}
$html .= '</select>';
return $html;
}
?>