diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-09-30 14:00:25 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-09-30 14:00:25 +0200 |
| commit | e64c1b463ee0188d4018bc6c66a3808d22b9fae1 (patch) | |
| tree | 7a3e69efc4f1ef0532a0472e5dd6b94a7fb5a391 /phpBB/phpbb/db | |
| parent | 8de97b8dbe8f4c30c208a9438f621016f4ed1599 (diff) | |
| parent | f1ab6f31a1f54466cf317a21f0f76fca77bff2fa (diff) | |
| download | forums-e64c1b463ee0188d4018bc6c66a3808d22b9fae1.tar forums-e64c1b463ee0188d4018bc6c66a3808d22b9fae1.tar.gz forums-e64c1b463ee0188d4018bc6c66a3808d22b9fae1.tar.bz2 forums-e64c1b463ee0188d4018bc6c66a3808d22b9fae1.tar.xz forums-e64c1b463ee0188d4018bc6c66a3808d22b9fae1.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13117] Correctly define auto increment columns as "NOT NULL" on mysql
Diffstat (limited to 'phpBB/phpbb/db')
| -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'; } |