diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-07-05 01:07:22 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-07-05 01:07:22 +0200 |
| commit | 5f73cdcdc295aeded117377496e9917c712f353f (patch) | |
| tree | 2ad2e330347030b4f0a81831aeab6fafad8db06b /phpBB/install/database_update.php | |
| parent | 1570a1e3b90b3f2d0402cd2530d0d030e27ab13e (diff) | |
| parent | fa253b8b581be9afceb6cdfe8fcb47d175b4fcf8 (diff) | |
| download | forums-5f73cdcdc295aeded117377496e9917c712f353f.tar forums-5f73cdcdc295aeded117377496e9917c712f353f.tar.gz forums-5f73cdcdc295aeded117377496e9917c712f353f.tar.bz2 forums-5f73cdcdc295aeded117377496e9917c712f353f.tar.xz forums-5f73cdcdc295aeded117377496e9917c712f353f.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[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/install/database_update.php
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 21defd0a80..f0fd640ebd 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1013,7 +1013,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', ''), @@ -1037,6 +1042,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 */ // Changes from 3.1.0-dev to 3.1.0-A1 '3.1.0-dev' => array( @@ -2046,6 +2059,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; + // Changes from 3.1.0-dev to 3.1.0-A1 case '3.1.0-dev': set_config('use_system_cron', 0); |