diff options
author | Andreas Fischer <bantu@phpbb.com> | 2011-07-05 01:03:37 +0200 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2011-07-05 01:03:37 +0200 |
commit | fa253b8b581be9afceb6cdfe8fcb47d175b4fcf8 (patch) | |
tree | 72317b8a8c8950959b726834fbb6c5b23b66e51f /phpBB/install/schemas/postgres_schema.sql | |
parent | b9b1e13e70b2fa695f85321682ef2397f2936be4 (diff) | |
parent | 7ca9c33157ad360750df8bf025a1155e14c6b2bb (diff) | |
download | forums-fa253b8b581be9afceb6cdfe8fcb47d175b4fcf8.tar forums-fa253b8b581be9afceb6cdfe8fcb47d175b4fcf8.tar.gz forums-fa253b8b581be9afceb6cdfe8fcb47d175b4fcf8.tar.bz2 forums-fa253b8b581be9afceb6cdfe8fcb47d175b4fcf8.tar.xz forums-fa253b8b581be9afceb6cdfe8fcb47d175b4fcf8.zip |
Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
[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/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
Diffstat (limited to 'phpBB/install/schemas/postgres_schema.sql')
-rw-r--r-- | phpBB/install/schemas/postgres_schema.sql | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql index 359ec325d7..cf655cb1c7 100644 --- a/phpBB/install/schemas/postgres_schema.sql +++ b/phpBB/install/schemas/postgres_schema.sql @@ -527,18 +527,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); |