Merge pull request #3003 from nickvergessen/ticket/13117

[ticket/13117] Correctly define auto increment columns as "NOT NULL" on mysql
This commit is contained in:
Nils Adermann 2014-09-30 14:00:02 +02:00
commit f1ab6f31a1

View file

@ -1512,7 +1512,7 @@ class tools
$sql .= (strpos($column_data[1], '0x') === 0) ? "DEFAULT {$column_data[1]} " : "DEFAULT '{$column_data[1]}' "; $sql .= (strpos($column_data[1], '0x') === 0) ? "DEFAULT {$column_data[1]} " : "DEFAULT '{$column_data[1]}' ";
} }
if (!is_null($column_data[1])) if (!is_null($column_data[1]) || (isset($column_data[2]) && $column_data[2] == 'auto_increment'))
{ {
$sql .= 'NOT NULL'; $sql .= 'NOT NULL';
} }