aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2011-07-03 02:15:40 -0400
committerNils Adermann <naderman@naderman.de>2011-07-03 02:15:40 -0400
commitcf4b639be5a178c73224246b1232e5044b9a5738 (patch)
tree42c54f8c3fca7d8a3a0dc0d0ff6cc4347df72349 /phpBB
parentffa6f3448fdfe6d076c894231ebbd59e3b51e2ba (diff)
downloadforums-cf4b639be5a178c73224246b1232e5044b9a5738.tar
forums-cf4b639be5a178c73224246b1232e5044b9a5738.tar.gz
forums-cf4b639be5a178c73224246b1232e5044b9a5738.tar.bz2
forums-cf4b639be5a178c73224246b1232e5044b9a5738.tar.xz
forums-cf4b639be5a178c73224246b1232e5044b9a5738.zip
[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
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/develop/create_schema_files.php2
-rw-r--r--phpBB/install/database_update.php12
-rw-r--r--phpBB/install/schemas/firebird_schema.sql14
-rw-r--r--phpBB/install/schemas/mssql_schema.sql8
-rw-r--r--phpBB/install/schemas/mysql_40_schema.sql2
-rw-r--r--phpBB/install/schemas/mysql_41_schema.sql2
-rw-r--r--phpBB/install/schemas/oracle_schema.sql20
-rw-r--r--phpBB/install/schemas/postgres_schema.sql6
-rw-r--r--phpBB/install/schemas/sqlite_schema.sql1
9 files changed, 13 insertions, 54 deletions
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index f4d89e5562..efe8837b26 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1223,7 +1223,6 @@ function get_schema_struct()
$schema_data['phpbb_login_attempts'] = array(
'COLUMNS' => array(
- 'attempt_id' => array('UINT', NULL, 'auto_increment'),
'attempt_ip' => array('VCHAR:40', ''),
'attempt_browser' => array('VCHAR:150', ''),
'attempt_forwarded_for' => array('VCHAR:255', ''),
@@ -1232,7 +1231,6 @@ function get_schema_struct()
'username' => array('VCHAR_UNI:255', 0),
'username_clean' => array('VCHAR_CI', 0),
),
- 'PRIMARY_KEY' => 'attempt_id',
'KEYS' => array(
'att_ip' => array('INDEX', array('attempt_ip', 'attempt_time')),
'att_for' => array('INDEX', array('attempt_forwarded_for', 'attempt_time')),
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')
+ ),
+ ),
);
}
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 5df7dfe9a5..40041b13cb 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -547,7 +547,6 @@ END;;
# Table: 'phpbb_login_attempts'
CREATE TABLE phpbb_login_attempts (
- attempt_id INTEGER NOT NULL,
attempt_ip VARCHAR(40) CHARACTER SET NONE DEFAULT '' NOT NULL,
attempt_browser VARCHAR(150) CHARACTER SET NONE DEFAULT '' NOT NULL,
attempt_forwarded_for VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
@@ -557,24 +556,11 @@ CREATE TABLE phpbb_login_attempts (
username_clean VARCHAR(255) CHARACTER SET UTF8 DEFAULT 0 NOT NULL COLLATE UNICODE
);;
-ALTER TABLE phpbb_login_attempts ADD PRIMARY KEY (attempt_id);;
-
CREATE INDEX phpbb_login_attempts_att_ip ON phpbb_login_attempts(attempt_ip, attempt_time);;
CREATE INDEX phpbb_login_attempts_att_for ON phpbb_login_attempts(attempt_forwarded_for, attempt_time);;
CREATE INDEX phpbb_login_attempts_att_time ON phpbb_login_attempts(attempt_time);;
CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts(user_id);;
-CREATE GENERATOR phpbb_login_attempts_gen;;
-SET GENERATOR phpbb_login_attempts_gen TO 0;;
-
-CREATE TRIGGER t_phpbb_login_attempts FOR phpbb_login_attempts
-BEFORE INSERT
-AS
-BEGIN
- NEW.attempt_id = GEN_ID(phpbb_login_attempts_gen, 1);
-END;;
-
-
# Table: 'phpbb_moderator_cache'
CREATE TABLE phpbb_moderator_cache (
forum_id INTEGER DEFAULT 0 NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 0bc76c05e6..c4fc2d4eec 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -653,7 +653,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 ,
@@ -664,13 +663,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
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 6b13485a3d..06d32166f3 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -371,7 +371,6 @@ CREATE TABLE phpbb_log (
# Table: 'phpbb_login_attempts'
CREATE TABLE phpbb_login_attempts (
- attempt_id mediumint(8) UNSIGNED NOT NULL auto_increment,
attempt_ip varbinary(40) DEFAULT '' NOT NULL,
attempt_browser varbinary(150) DEFAULT '' NOT NULL,
attempt_forwarded_for varbinary(255) DEFAULT '' NOT NULL,
@@ -379,7 +378,6 @@ CREATE TABLE phpbb_login_attempts (
user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
username blob NOT NULL,
username_clean blob NOT NULL,
- PRIMARY KEY (attempt_id),
KEY att_ip (attempt_ip, attempt_time),
KEY att_for (attempt_forwarded_for, attempt_time),
KEY att_time (attempt_time),
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index b400e8fcff..1db2790ec7 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -371,7 +371,6 @@ CREATE TABLE phpbb_log (
# Table: 'phpbb_login_attempts'
CREATE TABLE phpbb_login_attempts (
- attempt_id mediumint(8) UNSIGNED NOT NULL auto_increment,
attempt_ip varchar(40) DEFAULT '' NOT NULL,
attempt_browser varchar(150) DEFAULT '' NOT NULL,
attempt_forwarded_for varchar(255) DEFAULT '' NOT NULL,
@@ -379,7 +378,6 @@ CREATE TABLE phpbb_login_attempts (
user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
username varchar(255) DEFAULT '0' NOT NULL,
username_clean varchar(255) DEFAULT '0' NOT NULL,
- PRIMARY KEY (attempt_id),
KEY att_ip (attempt_ip, attempt_time),
KEY att_for (attempt_forwarded_for, attempt_time),
KEY att_time (attempt_time),
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 8c79e870cb..783261e365 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -744,15 +744,13 @@ END;
Table: 'phpbb_login_attempts'
*/
CREATE TABLE phpbb_login_attempts (
- attempt_id number(8) NOT NULL,
attempt_ip varchar2(40) DEFAULT '' ,
attempt_browser varchar2(150) DEFAULT '' ,
attempt_forwarded_for varchar2(255) DEFAULT '' ,
attempt_time number(11) DEFAULT '0' NOT NULL,
user_id number(8) DEFAULT '0' NOT NULL,
username varchar2(765) DEFAULT '0' NOT NULL,
- username_clean varchar2(255) DEFAULT '0' NOT NULL,
- CONSTRAINT pk_phpbb_login_attempts PRIMARY KEY (attempt_id)
+ username_clean varchar2(255) DEFAULT '0' NOT NULL
)
/
@@ -765,22 +763,6 @@ CREATE INDEX phpbb_login_attempts_att_time ON phpbb_login_attempts (attempt_time
CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts (user_id)
/
-CREATE SEQUENCE phpbb_login_attempts_seq
-/
-
-CREATE OR REPLACE TRIGGER t_phpbb_login_attempts
-BEFORE INSERT ON phpbb_login_attempts
-FOR EACH ROW WHEN (
- new.attempt_id IS NULL OR new.attempt_id = 0
-)
-BEGIN
- SELECT phpbb_login_attempts_seq.nextval
- INTO :new.attempt_id
- FROM dual;
-END;
-/
-
-
/*
Table: 'phpbb_moderator_cache'
*/
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);
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 3158c1a177..dae1eb839c 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -359,7 +359,6 @@ CREATE INDEX phpbb_log_user_id ON phpbb_log (user_id);
# Table: 'phpbb_login_attempts'
CREATE TABLE phpbb_login_attempts (
- attempt_id INTEGER PRIMARY KEY NOT NULL ,
attempt_ip varchar(40) NOT NULL DEFAULT '',
attempt_browser varchar(150) NOT NULL DEFAULT '',
attempt_forwarded_for varchar(255) NOT NULL DEFAULT '',
generated by cgit v1.2.1 (git 2.21.0) at 2025-02-18 06:55:43 +0000