From cf4b639be5a178c73224246b1232e5044b9a5738 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 3 Jul 2011 02:15:40 -0400 Subject: [ticket/10247] Remove unecessary attempt_id primary key column The database update drops any key of the same name (potential primary key) and afterwards the column. This does not work on some of the supported DBMS and needs further changes. PHPBB3-10247 --- phpBB/install/database_update.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'phpBB/install/database_update.php') diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 92bafcb32a..72eb8a6480 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); @@ -974,6 +974,16 @@ 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(), + + // Changes from 3.0.9-RC-3 to 3.0.9-RC4 + '3.0.9-RC3' => array( + 'drop_keys' => array( + LOGIN_ATTEMPT_TABLE => array('attempt_id') + ), + 'drop_columns' => array( + LOGIN_ATTEMPT_TABLE => array('attempt_id') + ), + ), ); } -- cgit v1.2.1 From 984fd07319d9c9dbd8af7298a94e08132e790f98 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 3 Jul 2011 02:29:51 -0400 Subject: [ticket/10247] Add empty data section to database update for RC4 PHPBB3-10247 --- phpBB/install/database_update.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'phpBB/install/database_update.php') diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 72eb8a6480..e1223335f0 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1983,6 +1983,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; } } -- cgit v1.2.1 From cb7604dcd83bf3a4ddf6ace1282974eaf475c8d8 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Mon, 4 Jul 2011 02:31:00 -0400 Subject: [ticket/10247] Removing attempt_id column from the 3.0.8 to 3.0.9-RC1 updater. To make sure that this column (which was too small and unecessary) does not remain on 3.0.9-RCX installations and boards that were updated to a 3.0.9 RC, the 3.0.10-RC1 release must correctly drop the column after db_tools has been corrected and fully reviewed. The current version is not capable of dropping primary keys correctly on all supported DBMSs. PHPBB3-10247 --- phpBB/install/database_update.php | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'phpBB/install/database_update.php') diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index e1223335f0..a45424afea 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', ''), @@ -974,16 +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(), - // Changes from 3.0.9-RC-3 to 3.0.9-RC4 - '3.0.9-RC3' => array( - 'drop_keys' => array( - LOGIN_ATTEMPT_TABLE => array('attempt_id') - ), - 'drop_columns' => array( - LOGIN_ATTEMPT_TABLE => array('attempt_id') - ), - ), + /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.10-RC1 */ ); } -- cgit v1.2.1 From d8ac2cc5f0c253842185506b174a8355dfd5f3fb Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Tue, 5 Jul 2011 00:40:45 +0200 Subject: [prep-release-3.0.9] Bumping version number for the final 3.0.9 release. --- phpBB/install/database_update.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/install/database_update.php') diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index a45424afea..a2cb4515da 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -8,7 +8,7 @@ * */ -define('UPDATES_TO_VERSION', '3.0.9-RC4'); +define('UPDATES_TO_VERSION', '3.0.9'); // Enter any version to update from to test updates. The version within the db will not be updated. define('DEBUG_FROM_VERSION', false); @@ -979,7 +979,7 @@ 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 + // 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 */ @@ -1983,7 +1983,7 @@ function change_database_data(&$no_updates, $version) case '3.0.9-RC2': break; - // No changes from 3.0.9-RC3 to 3.0.9-RC4 + // No changes from 3.0.9-RC3 to 3.0.9 case '3.0.9-RC3': break; } -- cgit v1.2.1