Permalink
Browse files

Fix ALTER export: add columns together with modify

  • Loading branch information...
1 parent 4358ba8 commit 1c1537b0896cc8e690aad2053bda93d8cd4493b4 @vrana committed Apr 24, 2011
Showing with 4 additions and 4 deletions.
  1. +4 −4 adminer/include/adminer.inc.php
@@ -582,10 +582,10 @@ function dumpTable($table, $style, $is_view = false) {
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

0 comments on commit 1c1537b

Please sign in to comment.