From bc24c78e06f9b16e4d4ca6ffad1944ee1312f254 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 29 Sep 2014 20:47:43 +0200 Subject: [PATCH] [ticket/13117] Correctly define auto increment columns as "NOT NULL" on mysql Unintended change from 95ab4b3e931521ce3c56068478311f0c04f713cc PHPBB3-13117 --- phpBB/phpbb/db/tools.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/db/tools.php b/phpBB/phpbb/db/tools.php index 3567570137..0781d7425e 100644 --- a/phpBB/phpbb/db/tools.php +++ b/phpBB/phpbb/db/tools.php @@ -1512,7 +1512,7 @@ class tools $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'; }