mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 14:00:31 +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:
@@ -529,18 +529,14 @@ CREATE INDEX phpbb_log_user_id ON phpbb_log (user_id);
|
||||
/*
|
||||
Table: 'phpbb_login_attempts'
|
||||
*/
|
||||
CREATE SEQUENCE phpbb_login_attempts_seq;
|
||||
|
||||
CREATE TABLE phpbb_login_attempts (
|
||||
attempt_id INT4 DEFAULT nextval('phpbb_login_attempts_seq'),
|
||||
attempt_ip varchar(40) DEFAULT '' NOT NULL,
|
||||
attempt_browser varchar(150) DEFAULT '' NOT NULL,
|
||||
attempt_forwarded_for varchar(255) DEFAULT '' NOT NULL,
|
||||
attempt_time INT4 DEFAULT '0' NOT NULL CHECK (attempt_time >= 0),
|
||||
user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
|
||||
username varchar(255) DEFAULT '0' NOT NULL,
|
||||
username_clean varchar_ci DEFAULT '0' NOT NULL,
|
||||
PRIMARY KEY (attempt_id)
|
||||
username_clean varchar_ci DEFAULT '0' NOT NULL
|
||||
);
|
||||
|
||||
CREATE INDEX phpbb_login_attempts_att_ip ON phpbb_login_attempts (attempt_ip, attempt_time);
|
||||
|
Reference in New Issue
Block a user