From 15d5334de6f5ba79d5722085a355ddd815fd54fb Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 7 Apr 2005 17:46:03 +0000 Subject: [PATCH] bug #117686, tbl_alter.php --- ChangeLog | 4 +++- libraries/common.lib.php | 2 +- tbl_alter.php | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9674db123..d436998da 100755 --- a/ChangeLog +++ b/ChangeLog @@ -6,7 +6,9 @@ $Id$ $Source$ 2005-04-07 Marc Delisle - * tbl_properties.inc.php: bug #1176896, undefined variable + * tbl_properties.inc.php, tbl_alter.php: bug #1176896, undefined variable + * libraries/common.lib.php: wrong test when the field's type is + TIMESTAMP ON UPDATE CURRENT_TIMESTAMP 2005-04-03 Marc Delisle ### 2.6.2-rc1 released diff --git a/libraries/common.lib.php b/libraries/common.lib.php index c22c9d174..69b9bb454 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2539,7 +2539,7 @@ if (typeof(document.getElementById) != 'undefined' $query .= ' NULL'; } - if ($default_current_timestamp && strtoupper($full_field_type) == 'TIMESTAMP') { + if ($default_current_timestamp && strpos(' ' . strtoupper($full_field_type),'TIMESTAMP') == 1) { $query .= ' DEFAULT CURRENT_TIMESTAMP'; // 0 is empty in PHP } elseif (!empty($default) || $default == '0') { diff --git a/tbl_alter.php b/tbl_alter.php index 7dc377621..a461d4f7f 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -66,7 +66,8 @@ if (isset($do_save_data)) { $full_field_type .= ' ' . $field_attribute[$i]; } // take care of native MySQL comments here - $query .= PMA_generateAlterTable($field_orig[$i], $field_name[$i], $full_field_type, (PMA_MYSQL_INT_VERSION >= 40100 && $field_collation[$i] != '' ? $field_collation[$i] : ''), $field_null[$i], $field_default[$i], $field_default_current_timestamp[$i], $field_extra[$i], (PMA_MYSQL_INT_VERSION >= 40100 && $field_comments[$i] != '' ? $field_comments[$i] : '')); + + $query .= PMA_generateAlterTable($field_orig[$i], $field_name[$i], $full_field_type, (PMA_MYSQL_INT_VERSION >= 40100 && $field_collation[$i] != '' ? $field_collation[$i] : ''), $field_null[$i], $field_default[$i], (isset($field_default_current_timestamp[$i]) ? $field_default_current_timestamp[$i] : ''), $field_extra[$i], (PMA_MYSQL_INT_VERSION >= 40100 && $field_comments[$i] != '' ? $field_comments[$i] : '')); } // end for // To allow replication, we first select the db to use and then run queries