From 931fff712addc404f4259aec11481c743a864c5d Mon Sep 17 00:00:00 2001 From: jakubvrana Date: Sat, 10 Oct 2009 21:33:22 +0000 Subject: [PATCH] Fix ALTER export git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1182 7c3ca157-0c34-0410-bff1-cbf682f78f5c --- adminer/include/export.inc.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/adminer/include/export.inc.php b/adminer/include/export.inc.php index cc4cbdd0..5b10aaa4 100644 --- a/adminer/include/export.inc.php +++ b/adminer/include/export.inc.php @@ -56,12 +56,13 @@ CREATE PROCEDURE adminer_alter (INOUT alter_command text) BEGIN $result = $connection->query($query); $after = ""; while ($row = $result->fetch_assoc()) { - $row["default"] = (isset($row["COLUMN_DEFAULT"]) ? $connection->quote($row["COLUMN_DEFAULT"]) : "NULL"); + $default = $row["COLUMN_DEFAULT"]; + $row["default"] = (isset($default) ? ($default == "CURRENT_TIMESTAMP" ? $default : $connection->quote($default)) : "NULL"); $row["after"] = $connection->quote($after); //! rgt AFTER lft, lft AFTER id doesn't work $row["alter"] = escape_string(idf_escape($row["COLUMN_NAME"]) . " $row[COLUMN_TYPE]" . ($row["COLLATION_NAME"] ? " COLLATE $row[COLLATION_NAME]" : "") - . (isset($row["COLUMN_DEFAULT"]) ? " DEFAULT $row[default]" : "") + . (isset($default) ? " DEFAULT $row[default]" : "") . ($row["IS_NULLABLE"] == "YES" ? "" : " NOT NULL") . ($row["EXTRA"] ? " $row[EXTRA]" : "") . ($row["COLUMN_COMMENT"] ? " COMMENT " . $connection->quote($row["COLUMN_COMMENT"]) : "")