diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php index d111f928f8..594c4100e7 100644 --- a/libraries/tbl_columns_definition_form.inc.php +++ b/libraries/tbl_columns_definition_form.inc.php @@ -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, diff --git a/templates/columns_definitions/column_attribute.phtml b/templates/columns_definitions/column_attribute.phtml index 79aa857a97..a489c8f6a0 100644 --- a/templates/columns_definitions/column_attribute.phtml +++ b/templates/columns_definitions/column_attribute.phtml @@ -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); ?>