webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-11-01 23:14:58 +03:00
Code Activity

Remove dead code. Following commit fd77f8d.

Browse Source 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
This commit is contained in:
Dan Ungureanu
2015-06-22 23:09:18 +03:00
parent 3309cd0128
commit bf55d536ad
3 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/tbl_columns_definition_form.inc.php
View File

@@ -246,10 +246,6 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) {
// 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($analyzed_sql[0]['create_table_fields']
[$fields_meta[$columnNumber]['Field']]['default_value'])) {
$columnMeta['DefaultType'] = 'USER_DEFINED';
$columnMeta['DefaultValue'] = $columnMeta['Default'];
} else {
$columnMeta['DefaultType'] = 'NONE';
$columnMeta['DefaultValue'] = '';
@@ -396,7 +392,6 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) {
'length' => $length,
'extracted_columnspec' => $extracted_columnspec,
'submit_attribute' => $submit_attribute,
'analyzed_sql' => isset($analyzed_sql) ? $analyzed_sql : null,
'comments_map' => $comments_map,
'fields_meta' => isset($fields_meta) ? $fields_meta : null,
'is_backup' => $is_backup,

11
templates/columns_definitions/column_attribute.phtml
View File

@@ -12,17 +12,6 @@ if (isset($submit_attribute) && $submit_attribute != false) {
$attribute = $extracted_columnspec['attribute'];
}
// MySQL 4.1.2+ TIMESTAMP options
// (if on_update_current_timestamp is set, then it's TRUE)
if (isset($columnMeta['Field'])) {
// 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.
$field = $analyzed_sql[0]['create_table_fields'][$columnMeta['Field']];
if (isset($field['on_update_current_timestamp'])) {
$attribute = 'on update CURRENT_TIMESTAMP';
}
}
$attribute = mb_strtoupper($attribute);
?>
<select style="width: 7em;"

1
templates/columns_definitions/column_attributes.phtml
View File

@@ -72,7 +72,6 @@ $ci_offset = -1;
'extracted_columnspec' => isset($extracted_columnspec) ? $extracted_columnspec : null,
'columnMeta' => isset($columnMeta) ? $columnMeta : null,
'submit_attribute' => isset($submit_attribute) ? $submit_attribute : null,
'analyzed_sql' => isset($analyzed_sql) ? $analyzed_sql : null
)); ?>
</td>
<td class="center">