Fix alter table

vrana · May 5, 2010 · 736d6e4 · 736d6e4
1 parent 44d572e
commit 736d6e4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
@@ -329,7 +329,7 @@ function rename_database($name, $collation) {
 	}
 
 	function auto_increment() {
-		return true;
+		return "";
 	}
 
 	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
@@ -344,23 +344,23 @@ function alter_table($table, $name, $fields, $foreign, $comment, $engine, $colla
 			} else {
 				$val5 = $val[5];
 				unset($val[5]);
-				if ($val[6]) { // auto_increment
-					$val = array($val[0], ($val[1] == "bigint" ? "big" : "") . "serial");
+				if (isset($val[6]) && $field[0] == "") { // auto_increment
+					$val[1] = ($val[1] == "bigint" ? " big" : " ") . "serial";
 				}
 				if ($field[0] == "") {
 					$alter[] = ($table != "" ? "ADD " : "  ") . implode("", $val);
 				} else {
 					if ($column != $val[0]) {
 						$queries[] = "ALTER TABLE " . idf_escape($table) . " RENAME $column TO $val[0]";
 					}
-					$alter[] = "ALTER $column TYPE $val[1]";
+					$alter[] = "ALTER $column TYPE$val[1]";
 					if (!$val[6]) {
-						$alter[] = "ALTER $column" . ($val[3] ? " SET$val[3]" : " DROP DEFAULT"); //! quoting
+						$alter[] = "ALTER $column " . ($val[3] ? "SET$val[3]" : "DROP DEFAULT"); //! quoting
 						$alter[] = "ALTER $column " . ($val[2] == " NULL" ? "DROP NOT" : "SET") . $val[2];
 					}
 				}
-				if ($table != "" || $val5 != "") {
-					$queries[] = "COMMENT ON COLUMN " . idf_escape($table) . ".$val[0] IS " . substr($val5, 9);
+				if ($field[0] != "" || $val5 != "") {
+					$queries[] = "COMMENT ON COLUMN " . idf_escape($table) . ".$val[0] IS " . ($val5 != "" ? substr($val5, 9) : "''");
 				}
 			}
 		}

diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php
@@ -153,7 +153,7 @@ function process_field($field, $type_field) {
 		(isset($field["default"]) ? " DEFAULT " . ($field["type"] == "timestamp" && eregi("^CURRENT_TIMESTAMP$", $field["default"]) ? $field["default"] : $connection->quote($field["default"])) : ""),
 		($field["on_update"] ? " ON UPDATE $field[on_update]" : ""),
 		(support("comment") && $field["comment"] != "" ? " COMMENT " . $connection->quote($field["comment"]) : ""),
-		($field["auto_increment"] ? auto_increment() : ""),
+		($field["auto_increment"] ? auto_increment() : null),
 	);
 }