diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-07-05 00:27:04 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-07-05 00:27:04 +0200 |
| commit | f5d86d06040de198d15fe9596c63186da02347d8 (patch) | |
| tree | 23616fb831fef47ea8665aef55cf2594eb59b3fd /phpBB/install/database_update.php | |
| parent | ffa6f3448fdfe6d076c894231ebbd59e3b51e2ba (diff) | |
| parent | cb7604dcd83bf3a4ddf6ace1282974eaf475c8d8 (diff) | |
| download | forums-f5d86d06040de198d15fe9596c63186da02347d8.tar forums-f5d86d06040de198d15fe9596c63186da02347d8.tar.gz forums-f5d86d06040de198d15fe9596c63186da02347d8.tar.bz2 forums-f5d86d06040de198d15fe9596c63186da02347d8.tar.xz forums-f5d86d06040de198d15fe9596c63186da02347d8.zip | |
Merge remote-tracking branch 'naderman/ticket/10247' into prep-release-3.0.9
* naderman/ticket/10247:
[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
Diffstat (limited to 'phpBB/install/database_update.php')
| -rw-r--r-- | phpBB/install/database_update.php | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 92bafcb32a..a45424afea 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -8,7 +8,7 @@ * */ -define('UPDATES_TO_VERSION', '3.0.9-RC3'); +define('UPDATES_TO_VERSION', '3.0.9-RC4'); // Enter any version to update from to test updates. The version within the db will not be updated. define('DEBUG_FROM_VERSION', false); @@ -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', ''), @@ -974,6 +979,10 @@ function database_update_info() '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-RC4 + '3.0.9-RC3' => array(), + + /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.10-RC1 */ ); } @@ -1973,6 +1982,10 @@ function change_database_data(&$no_updates, $version) // 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-RC4 + case '3.0.9-RC3': + break; } } |