diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-07-05 01:03:37 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-07-05 01:03:37 +0200 |
| commit | fa253b8b581be9afceb6cdfe8fcb47d175b4fcf8 (patch) | |
| tree | 72317b8a8c8950959b726834fbb6c5b23b66e51f /phpBB/install/database_update.php | |
| parent | b9b1e13e70b2fa695f85321682ef2397f2936be4 (diff) | |
| parent | 7ca9c33157ad360750df8bf025a1155e14c6b2bb (diff) | |
| download | forums-fa253b8b581be9afceb6cdfe8fcb47d175b4fcf8.tar forums-fa253b8b581be9afceb6cdfe8fcb47d175b4fcf8.tar.gz forums-fa253b8b581be9afceb6cdfe8fcb47d175b4fcf8.tar.bz2 forums-fa253b8b581be9afceb6cdfe8fcb47d175b4fcf8.tar.xz forums-fa253b8b581be9afceb6cdfe8fcb47d175b4fcf8.zip | |
Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
[prep-release-3.0.9] Update Changelog for 3.0.9 release.
[prep-release-3.0.9] Bumping version number for the final 3.0.9 release.
[ticket/10247] Removing attempt_id column from the 3.0.8 to 3.0.9-RC1 updater.
[ticket/10247] Add a db_tools test for the removal of a primary key column.
[ticket/10247] Add empty data section to database update for RC4
[ticket/10247] Remove unecessary attempt_id primary key column
Conflicts:
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
Diffstat (limited to 'phpBB/install/database_update.php')
| -rw-r--r-- | phpBB/install/database_update.php | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index b08a900c5b..fe2946501f 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -946,7 +946,12 @@ function database_update_info() 'add_tables' => array( LOGIN_ATTEMPT_TABLE => array( 'COLUMNS' => array( - 'attempt_id' => array('UINT', NULL, 'auto_increment'), + // this column was removed from the database updater + // after 3.0.9-RC3 was released. It might still exist + // in 3.0.9-RCX installations and has to be dropped in + // 3.0.10 after the db_tools class is capable of properly + // removing a primary key. + // 'attempt_id' => array('UINT', NULL, 'auto_increment'), 'attempt_ip' => array('VCHAR:40', ''), 'attempt_browser' => array('VCHAR:150', ''), 'attempt_forwarded_for' => array('VCHAR:255', ''), @@ -970,6 +975,14 @@ function database_update_info() ), ), ), + // No changes from 3.0.9-RC1 to 3.0.9-RC2 + '3.0.9-RC1' => array(), + // No changes from 3.0.9-RC2 to 3.0.9-RC3 + '3.0.9-RC2' => array(), + // No changes from 3.0.9-RC3 to 3.0.9 + '3.0.9-RC3' => array(), + + /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.10-RC1 */ ); } @@ -1961,6 +1974,18 @@ function change_database_data(&$no_updates, $version) $no_updates = false; break; + + // No changes from 3.0.9-RC1 to 3.0.9-RC2 + case '3.0.9-RC1': + break; + + // No changes from 3.0.9-RC2 to 3.0.9-RC3 + case '3.0.9-RC2': + break; + + // No changes from 3.0.9-RC3 to 3.0.9 + case '3.0.9-RC3': + break; } } |