diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-09-29 20:47:43 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-09-29 20:48:47 +0200 |
| commit | bc24c78e06f9b16e4d4ca6ffad1944ee1312f254 (patch) | |
| tree | 4ffc84167fd18963d94015875469478fd825c1bf | |
| parent | 71ac6ab2b87ec1d606d5669b930ac4c7164e9b11 (diff) | |
| download | forums-bc24c78e06f9b16e4d4ca6ffad1944ee1312f254.tar forums-bc24c78e06f9b16e4d4ca6ffad1944ee1312f254.tar.gz forums-bc24c78e06f9b16e4d4ca6ffad1944ee1312f254.tar.bz2 forums-bc24c78e06f9b16e4d4ca6ffad1944ee1312f254.tar.xz forums-bc24c78e06f9b16e4d4ca6ffad1944ee1312f254.zip | |
[ticket/13117] Correctly define auto increment columns as "NOT NULL" on mysql
Unintended change from 95ab4b3e931521ce3c56068478311f0c04f713cc
PHPBB3-13117
| -rw-r--r-- | phpBB/phpbb/db/tools.php | 2 |
1 files changed, 1 insertions, 1 deletions
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'; } |