mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-30 21:40:43 +02:00
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
This commit is contained in:
@@ -657,7 +657,6 @@ GO
|
||||
Table: 'phpbb_login_attempts'
|
||||
*/
|
||||
CREATE TABLE [phpbb_login_attempts] (
|
||||
[attempt_id] [int] IDENTITY (1, 1) NOT NULL ,
|
||||
[attempt_ip] [varchar] (40) DEFAULT ('') NOT NULL ,
|
||||
[attempt_browser] [varchar] (150) DEFAULT ('') NOT NULL ,
|
||||
[attempt_forwarded_for] [varchar] (255) DEFAULT ('') NOT NULL ,
|
||||
@@ -668,13 +667,6 @@ CREATE TABLE [phpbb_login_attempts] (
|
||||
) ON [PRIMARY]
|
||||
GO
|
||||
|
||||
ALTER TABLE [phpbb_login_attempts] WITH NOCHECK ADD
|
||||
CONSTRAINT [PK_phpbb_login_attempts] PRIMARY KEY CLUSTERED
|
||||
(
|
||||
[attempt_id]
|
||||
) ON [PRIMARY]
|
||||
GO
|
||||
|
||||
CREATE INDEX [att_ip] ON [phpbb_login_attempts]([attempt_ip], [attempt_time]) ON [PRIMARY]
|
||||
GO
|
||||
|
||||
|
Reference in New Issue
Block a user