From 0eae8040e88291a621b8918384a1cb4bcbaf56d7 Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Mon, 4 Jul 2005 14:13:43 +0000 Subject: [PATCH] It's been a while since I wrote schemas for non-mysql DB's ... so don't be surprised if they are spectacularly incorrect git-svn-id: file:///svn/phpbb/trunk@5174 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/install/schemas/firebird_schema.sql | 36 +++++++++++++++++ phpBB/install/schemas/mssql_schema.sql | 49 +++++++++++++++++++++++ phpBB/install/schemas/mysql_schema.sql | 1 - phpBB/install/schemas/oracle_schema.sql | 29 ++++++++++++++ phpBB/install/schemas/postgres_schema.sql | 21 ++++++++++ phpBB/install/schemas/sqlite_schema.sql | 20 +++++++++ 6 files changed, 155 insertions(+), 1 deletion(-) diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql index ed4b4fa0b9..21628465dc 100644 --- a/phpBB/install/schemas/firebird_schema.sql +++ b/phpBB/install/schemas/firebird_schema.sql @@ -512,6 +512,14 @@ CREATE TABLE phpbb_sessions ( session_admin INTEGER DEFAULT 0 NOT NULL );; +# phpbb_sessions_keys +CREATE TABLE phpbb_sessions_keys ( + key_id VARCHAR(32) NOT NULL, + user_id INTEGER DEFAULT 0 NOT NULL, + last_ip VARCHAR(40) DEFAULT '0' NOT NULL, + last_login INTEGER DEFAULT 0 NOT NULL +);; + # phpbb_sitelist CREATE TABLE phpbb_sitelist ( site_id INTEGER NOT NULL, @@ -787,6 +795,13 @@ CREATE TABLE phpbb_users ( user_newpasswd VARCHAR(32) NOT NULL );; +# phpbb_users_passwd +CREATE TABLE phpbb_users_passwd ( + user_id INTEGER NOT NULL, + passwd_time INTEGER NOT NULL, + passwd VARCHAR(32) NOT NULL +);; + # phpbb_words CREATE TABLE phpbb_words ( word_id INTEGER NOT NULL, @@ -1415,6 +1430,27 @@ ON phpbb_zebra( zebra_id );; +ALTER TABLE phpbb_sessions_keys +ADD PRIMARY KEY ( + key_id, + user_id +);; + +CREATE INDEX last_login82 +ON phpbb_sessions_keys( + last_login +);; + +ALTER TABLE phpbb_users_passwd +ADD PRIMARY KEY ( + user_id +);; + +CREATE INDEX passwd_time83 +ON phpbb_users_passwd( + passwd_time +);; + CREATE GENERATOR G_phpbb_attachmentsattach_idGen;; SET GENERATOR G_phpbb_attachmentsattach_idGen TO 0;; diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql index af3fa0606e..c71b5f0f40 100644 --- a/phpBB/install/schemas/mssql_schema.sql +++ b/phpBB/install/schemas/mssql_schema.sql @@ -518,6 +518,14 @@ CREATE TABLE [phpbb_sessions] ( ) ON [PRIMARY] GO +CREATE TABLE [phpbb_sessions_keys] ( + [key_id] [varchar] (32) NOT NULL , + [user_id] [int] NOT NULL , + [last_ip] [varchar] (100) NOT NULL , + [last_login] [int] NOT NULL +) ON [PRIMARY] +GO + CREATE TABLE [phpbb_sitelist] ( [site_id] [int] IDENTITY (1, 1) NOT NULL , [site_ip] [varchar] (40) NOT NULL , @@ -791,6 +799,13 @@ CREATE TABLE [phpbb_users] ( ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] GO +CREATE TABLE [phpbb_users_passwd] ( + [user_id] [int] NOT NULL , + [passwd_time] [int] NOT NULL , + [passwd] [varchar] (32) NOT NULL +) ON [PRIMARY] +GO + CREATE TABLE [phpbb_words] ( [word_id] [int] IDENTITY (1, 1) NOT NULL , [word] [varchar] (100) NOT NULL , @@ -1058,6 +1073,14 @@ ALTER TABLE [phpbb_sessions] WITH NOCHECK ADD ) ON [PRIMARY] GO +ALTER TABLE [phpbb_sessions_keys] WITH NOCHECK ADD + CONSTRAINT [PK_phpbb_sessions_keys] PRIMARY KEY CLUSTERED + ( + [key_id], + [user_id] + ) ON [PRIMARY] +GO + ALTER TABLE [phpbb_sitelist] WITH NOCHECK ADD CONSTRAINT [PK_phpbb_sitelist] PRIMARY KEY CLUSTERED ( @@ -1122,6 +1145,13 @@ ALTER TABLE [phpbb_users] WITH NOCHECK ADD ) ON [PRIMARY] GO +ALTER TABLE [phpbb_users_passwd] WITH NOCHECK ADD + CONSTRAINT [PK_phpbb_users_passwd] PRIMARY KEY CLUSTERED + ( + [user_id] + ) ON [PRIMARY] +GO + ALTER TABLE [phpbb_words] WITH NOCHECK ADD CONSTRAINT [PK_phpbb_words] PRIMARY KEY CLUSTERED ( @@ -1448,6 +1478,13 @@ ALTER TABLE [phpbb_sessions] WITH NOCHECK ADD CONSTRAINT [DF_sessio_session_admin] DEFAULT (0) FOR [session_admin] GO +ALTER TABLE [phpbb_sessions] WITH NOCHECK ADD + CONSTRAINT [DF_sessik_key_id] DEFAULT ('0') FOR [key_id], + CONSTRAINT [DF_sessik_user_id] DEFAULT (0) FOR [user_id], + CONSTRAINT [DF_sessik_last_ip] DEFAULT ('0') FOR [last_ip], + CONSTRAINT [DF_sessik_last_login] DEFAULT (0) FOR [last_login] +GO + ALTER TABLE [phpbb_sitelist] WITH NOCHECK ADD CONSTRAINT [DF_siteli_ip_exclude] DEFAULT (0) FOR [ip_exclude] GO @@ -1568,6 +1605,12 @@ ALTER TABLE [phpbb_users] WITH NOCHECK ADD CONSTRAINT [DF_users__user_sig_bbcode_bitf] DEFAULT (0) FOR [user_sig_bbcode_bitfield] GO +ALTER TABLE [phpbb_users_passwd] WITH NOCHECK ADD + CONSTRAINT [DF_users_pwd_user_id] DEFAULT (0) FOR [user_id], + CONSTRAINT [DF_users_pwd_passwd_time] DEFAULT (0) FOR [passwd_time], + CONSTRAINT [DF_users_pwd_passwd] DEFAULT ('0') FOR [passwd] +GO + ALTER TABLE [phpbb_zebra] WITH NOCHECK ADD CONSTRAINT [DF_zebra__user_id] DEFAULT (0) FOR [user_id], CONSTRAINT [DF_zebra__zebra_id] DEFAULT (0) FOR [zebra_id], @@ -1743,6 +1786,9 @@ GO CREATE INDEX [session_user_id] ON [phpbb_sessions]([session_user_id]) ON [PRIMARY] GO +CREATE INDEX [last_login] ON [phpbb_sessions_keys]([last_login]) ON [PRIMARY] +GO + CREATE UNIQUE INDEX [style_name] ON [phpbb_styles]([style_name]) ON [PRIMARY] GO @@ -1806,6 +1852,9 @@ GO CREATE INDEX [username] ON [phpbb_users]([username]) ON [PRIMARY] GO +CREATE INDEX [passwd_time] ON [phpbb_users_passwd]([passwd_time]) ON [PRIMARY] +GO + CREATE INDEX [user_id] ON [phpbb_zebra]([user_id]) ON [PRIMARY] GO diff --git a/phpBB/install/schemas/mysql_schema.sql b/phpBB/install/schemas/mysql_schema.sql index 554fc6d3d7..d99d74a638 100644 --- a/phpBB/install/schemas/mysql_schema.sql +++ b/phpBB/install/schemas/mysql_schema.sql @@ -943,7 +943,6 @@ CREATE TABLE phpbb_users_passwd ( KEY passwd_time (passwd_time) ); - # Table: 'phpbb_words' CREATE TABLE phpbb_words ( word_id mediumint(8) UNSIGNED NOT NULL auto_increment, diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql index 181af27c47..405ec79ff8 100644 --- a/phpBB/install/schemas/oracle_schema.sql +++ b/phpBB/install/schemas/oracle_schema.sql @@ -1212,6 +1212,21 @@ CREATE INDEX session_time on phpbb_sessions (session_time) CREATE INDEX session_user_id on phpbb_sessions (session_user_id) / +/* + Table: phpbb_sessions_keys +*/ +CREATE TABLE phpbb_sessions_keys ( + key_id varchar2(32) DEFAULT '', + user_id number(8) DEFAULT '0' NOT NULL, + last_ip varchar2(40) DEFAULT '0', + last_login number(11) DEFAULT '0' NOT NULL, + CONSTRAINT pk_phpbb_sessions_keys PRIMARY KEY (key_id,user_id) +) +/ + +CREATE INDEX last_login on phpbb_sessions_keys (last_login) +/ + /* Table: phpbb_sitelist */ @@ -1694,6 +1709,20 @@ CREATE INDEX user_email_hash on phpbb_users (user_email_hash) CREATE INDEX username on phpbb_users (username) / +/* + Table: phpbb_users_passwd +*/ +CREATE TABLE phpbb_users_passwd ( + user_id number(8) NOT NULL, + passwd_time number(11) DEFAULT '0' NOT NULL, + passwd varchar2(32), + CONSTRAINT pk_phpbb_users_passwd PRIMARY KEY (user_id) +) +/ + +CREATE INDEX passwd_time on phpbb_users_passwd (passwd_time) +/ + /* Table: phpbb_words */ diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql index b018079a51..3f22b3af0b 100644 --- a/phpBB/install/schemas/postgres_schema.sql +++ b/phpBB/install/schemas/postgres_schema.sql @@ -824,6 +824,17 @@ CREATE TABLE phpbb_sessions ( CREATE INDEX session_time_phpbb_sessions_index ON phpbb_sessions (session_time); CREATE INDEX session_user_id_phpbb_sessions_index ON phpbb_sessions (session_user_id); +/* Table: phpbb_sessions_keys */ +CREATE TABLE phpbb_sessions_keys ( + key_id varchar(32) DEFAULT '' NOT NULL, + user_id INT4 DEFAULT '0' NOT NULL, + last_ip varchar(40) DEFAULT '0' NOT NULL, + last_login INT4 DEFAULT '0' NOT NULL, + PRIMARY KEY (key_id,user_id) +); + +CREATE INDEX last_login_phpbb_sessions_keys_index ON phpbb_sessions_keys (last_login); + /* Table: phpbb_sitelist */ CREATE SEQUENCE phpbb_sitelist_site_id_seq; @@ -1201,6 +1212,16 @@ CREATE INDEX username_phpbb_users_index ON phpbb_users (username); SELECT SETVAL('phpbb_users_user_id_seq',(select case when max(user_id)>0 then max(user_id)+1 else 1 end from phpbb_users)); +/* Table: phpbb_users_passwd */ +CREATE TABLE phpbb_users_passwd ( + user_id INT4 DEFAULT '0' NOT NULL, + passwd_time INT4 DEFAULT '0' NOT NULL, + passwd varchar(32) DEFAULT '' NOT NULL, + PRIMARY KEY (user_id), +); + +CREATE INDEX passwd_time_phpbb_users_passwd_index ON phpbb_users_passwd (passwd_time); + /* Table: phpbb_words */ CREATE SEQUENCE phpbb_words_word_id_seq; diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql index bd2bc7a3e4..56958910f6 100644 --- a/phpBB/install/schemas/sqlite_schema.sql +++ b/phpBB/install/schemas/sqlite_schema.sql @@ -605,6 +605,17 @@ CREATE TABLE phpbb_sessions ( CREATE INDEX session_time_phpbb_sessions on phpbb_sessions (session_time); CREATE INDEX session_user_id_phpbb_sessions on phpbb_sessions (session_user_id); +# Table: phpbb_sessions_keys +CREATE TABLE phpbb_sessions_keys ( + key_id varchar(32) NOT NULL DEFAULT '', + user_id mediumint(8) NOT NULL DEFAULT '0', + last_ip varchar(40) NOT NULL DEFAULT '', + last_login int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (key_id,user_id) +); + +CREATE INDEX last_login_phpbb_sessions_keys on phpbb_sessions_keys (last_login); + # Table: phpbb_sitelist CREATE TABLE phpbb_sitelist ( site_id INTEGER PRIMARY KEY NOT NULL, @@ -909,6 +920,15 @@ CREATE INDEX user_birthday_phpbb_users on phpbb_users (user_birthday); CREATE INDEX user_email_hash_phpbb_users on phpbb_users (user_email_hash); CREATE INDEX username_phpbb_users on phpbb_users (username); +# Table: phpbb_users_passwd +CREATE TABLE phpbb_users_passwd ( + user_id INTEGER PRIMARY KEY NOT NULL, + passwd_time int(11) NOT NULL DEFAULT '0', + passwd varchar(32) NOT NULL DEFAULT '', +); + +CREATE INDEX passwd_time_phpbb_users_passwd on phpbb_users_passwd (passwd_time); + # Table: phpbb_words CREATE TABLE phpbb_words ( word_id INTEGER PRIMARY KEY NOT NULL,