From: Jakub Vrana <jakub@vrana.cz>
Date: Sun, 24 Apr 2011 12:42:46 +0000 (+0200)
Subject: Fix ALTER export: add columns together with modify
X-Git-Tag: v3.3.0~87
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=1c1537b0896cc8e690aad2053bda93d8cd4493b4;p=adminer.git

Fix ALTER export: add columns together with modify
---

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 75965051..420ab06f 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -582,10 +582,10 @@ CREATE PROCEDURE adminer_alter (INOUT alter_command text) BEGIN
 			foreach ($fields as $row) {
 				echo "
 				WHEN " . q($row["COLUMN_NAME"]) . " THEN
-					SET add_columns = REPLACE(add_columns, ', ADD $row[alter]', '');
-					IF NOT (_column_default <=> $row[default]) OR _is_nullable != '$row[IS_NULLABLE]' OR _collation_name != '$row[COLLATION_NAME]' OR _column_type != " . q($row["COLUMN_TYPE"]) . " OR _extra != '$row[EXTRA]' OR _column_comment != " . q($row["COLUMN_COMMENT"]) . " OR after != $row[after] THEN
-						SET @alter_table = CONCAT(@alter_table, ', MODIFY $row[alter]');
-					END IF;"; //! don't replace in comment
+					SET add_columns = REPLACE(add_columns, ', ADD $row[alter]', IF(
+						_column_default <=> $row[default] AND _is_nullable = '$row[IS_NULLABLE]' AND _collation_name <=> " . (isset($row["COLLATION_NAME"]) ? "'$row[COLLATION_NAME]'" : "NULL") . " AND _column_type = " . q($row["COLUMN_TYPE"]) . " AND _extra = '$row[EXTRA]' AND _column_comment = " . q($row["COLUMN_COMMENT"]) . " AND after = $row[after]
+					, '', ', MODIFY $row[alter]'));"
+				; //! don't replace in comment
 			}
 			echo "
 				ELSE