diff options
Diffstat (limited to 'phpBB/install')
-rw-r--r-- | phpBB/install/convertors/convert_phpbb20.php | 1 | ||||
-rw-r--r-- | phpBB/install/convertors/functions_phpbb20.php | 24 | ||||
-rw-r--r-- | phpBB/install/database_update.php | 4 | ||||
-rwxr-xr-x | phpBB/install/install_install.php | 2 | ||||
-rw-r--r-- | phpBB/install/schemas/db2_schema.sql | 3 | ||||
-rw-r--r-- | phpBB/install/schemas/firebird_schema.sql | 3 | ||||
-rw-r--r-- | phpBB/install/schemas/mssql_schema.sql | 7 | ||||
-rw-r--r-- | phpBB/install/schemas/mysql_schema.sql | 7 | ||||
-rw-r--r-- | phpBB/install/schemas/oracle_schema.sql | 11 | ||||
-rw-r--r-- | phpBB/install/schemas/postgres_schema.sql | 251 | ||||
-rw-r--r-- | phpBB/install/schemas/schema_data.sql | 12 | ||||
-rw-r--r-- | phpBB/install/schemas/sqlite_schema.sql | 3 |
12 files changed, 152 insertions, 176 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 16b500d8d5..518de114b8 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -800,6 +800,7 @@ if (!$get_info) array('group_display', 0, ''), array('group_legend', 0, ''), array('group_name', 'groups.group_name', 'phpbb_convert_group_name'), // phpbb_set_encoding called in phpbb_convert_group_name + array('group_name_clean', 'groups.group_name', 'phpbb_convert_group_name_clean'), // phpbb_set_encoding called in phpbb_convert_group_name array('group_desc', 'groups.group_description', 'phpbb_set_encoding'), 'where' => 'groups.group_single_user = 0', diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index d503f66939..061abba0a0 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -574,7 +574,7 @@ function phpbb_convert_authentication($mode) $sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " - WHERE group_name = '" . $db->sql_escape('BOTS') . "'"; + WHERE group_name_clean = '" . $db->sql_escape('bots') . "'"; $result = $db->sql_query($sql); $bot_group_id = (int) $db->sql_fetchfield('group_id'); $db->sql_freeresult($result); @@ -1140,6 +1140,28 @@ function phpbb_convert_group_name($group_name) } /** +* Convert the group name, making sure to avoid conflicts with 3.0 special groups +*/ +function phpbb_convert_group_name_clean($group_name) +{ + $default_groups = array( + 'GUESTS', + 'REGISTERED', + 'REGISTERED_COPPA', + 'GLOBAL_MODERATORS', + 'ADMINISTRATORS', + 'BOTS', + ); + + if (in_array(strtoupper($group_name), $default_groups)) + { + return utf8_clean_string('phpBB2 - ' . $group_name); + } + + return utf8_clean_string(phpbb_set_default_encoding($group_name)); +} + +/** * Convert the group type constants */ function phpbb_convert_group_type($group_type) diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 40666c29dc..1ead7b1a32 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -310,7 +310,7 @@ $dbms_type_map = array( 'UINT' => 'INT4', // unsigned 'UINT:' => 'INT4', // unsigned 'USINT' => 'INT2', // unsigned - 'BOOL' => 'INT2', // unsigned + 'BOOL' => 'boolean', // unsigned 'TINT:' => 'INT2', 'VCHAR' => 'varchar(255)', 'VCHAR:' => 'varchar(%d)', @@ -327,7 +327,7 @@ $dbms_type_map = array( 'DECIMAL' => 'decimal(5,2)', 'VCHAR_UNI' => 'varchar(255)', 'VCHAR_UNI:'=> 'varchar(%d)', - 'VCHAR_CI' => 'varchar_ci', + 'VCHAR_CI' => 'varchar(255)', 'VARBINARY' => 'bytea', ), ); diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 4be58ed157..f4fc2f298c 100755 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1817,7 +1817,7 @@ class install_install extends module $sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " - WHERE group_name = 'BOTS'"; + WHERE group_name_clean = 'bots'"; $result = $db->sql_query($sql); $group_id = (int) $db->sql_fetchfield('group_id'); $db->sql_freeresult($result); diff --git a/phpBB/install/schemas/db2_schema.sql b/phpBB/install/schemas/db2_schema.sql index 3e1482be47..247551ceb7 100644 --- a/phpBB/install/schemas/db2_schema.sql +++ b/phpBB/install/schemas/db2_schema.sql @@ -179,6 +179,7 @@ CREATE TABLE phpbb_config ( ); CREATE INDEX phpbb_config_is_dynamic ON phpbb_config (is_dynamic) PCTFREE 10 MINPCTUSED 10 ALLOW REVERSE SCANS PAGE SPLIT SYMMETRIC COLLECT SAMPLED DETAILED STATISTICS; +CREATE INDEX phpbb_config_config_name ON phpbb_config (config_name) PCTFREE 10 MINPCTUSED 10 ALLOW REVERSE SCANS PAGE SPLIT SYMMETRIC COLLECT SAMPLED DETAILED STATISTICS; /* Table: 'phpbb_confirm' @@ -341,6 +342,7 @@ CREATE TABLE phpbb_groups ( group_type smallint NOT NULL DEFAULT 1, group_founder_manage smallint NOT NULL DEFAULT 0, group_name varchar(255) NOT NULL DEFAULT '', + group_name_clean varchar(255) NOT NULL DEFAULT '', group_desc clob(65K) NOT NULL DEFAULT '', group_desc_bitfield varchar(255) NOT NULL DEFAULT '', group_desc_options integer NOT NULL DEFAULT 7, @@ -1119,4 +1121,5 @@ CREATE TABLE phpbb_zebra ( PRIMARY KEY (user_id, zebra_id) ); +CREATE INDEX phpbb_zebra_zebra_user ON phpbb_zebra (zebra_id, user_id) PCTFREE 10 MINPCTUSED 10 ALLOW REVERSE SCANS PAGE SPLIT SYMMETRIC COLLECT SAMPLED DETAILED STATISTICS; diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql index 686c59184b..edde521739 100644 --- a/phpBB/install/schemas/firebird_schema.sql +++ b/phpBB/install/schemas/firebird_schema.sql @@ -220,6 +220,7 @@ CREATE TABLE phpbb_config ( ALTER TABLE phpbb_config ADD PRIMARY KEY (config_name);; CREATE INDEX phpbb_config_is_dynamic ON phpbb_config(is_dynamic);; +CREATE INDEX phpbb_config_config_name ON phpbb_config(config_name);; # Table: 'phpbb_confirm' CREATE TABLE phpbb_confirm ( @@ -425,6 +426,7 @@ CREATE TABLE phpbb_groups ( group_type INTEGER DEFAULT 1 NOT NULL, group_founder_manage INTEGER DEFAULT 0 NOT NULL, group_name VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + group_name_clean VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, group_desc BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, group_desc_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, group_desc_options INTEGER DEFAULT 7 NOT NULL, @@ -1430,4 +1432,5 @@ CREATE TABLE phpbb_zebra ( ALTER TABLE phpbb_zebra ADD PRIMARY KEY (user_id, zebra_id);; +CREATE INDEX phpbb_zebra_zebra_user ON phpbb_zebra(zebra_id, user_id);; diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql index 804a970013..03c4c4c398 100644 --- a/phpBB/install/schemas/mssql_schema.sql +++ b/phpBB/install/schemas/mssql_schema.sql @@ -293,6 +293,9 @@ GO CREATE INDEX [is_dynamic] ON [phpbb_config]([is_dynamic]) ON [PRIMARY] GO +CREATE INDEX [config_name] ON [phpbb_config]([config_name]) ON [PRIMARY] +GO + /* Table: 'phpbb_confirm' @@ -530,6 +533,7 @@ CREATE TABLE [phpbb_groups] ( [group_type] [int] DEFAULT (1) NOT NULL , [group_founder_manage] [int] DEFAULT (0) NOT NULL , [group_name] [varchar] (255) DEFAULT ('') NOT NULL , + [group_name_clean] [varchar] (255) DEFAULT ('') NOT NULL , [group_desc] [varchar] (4000) DEFAULT ('') NOT NULL , [group_desc_bitfield] [varchar] (255) DEFAULT ('') NOT NULL , [group_desc_options] [int] DEFAULT (7) NOT NULL , @@ -1703,6 +1707,9 @@ ALTER TABLE [phpbb_zebra] WITH NOCHECK ADD ) ON [PRIMARY] GO +CREATE INDEX [zebra_user] ON [phpbb_zebra]([zebra_id], [user_id]) ON [PRIMARY] +GO + COMMIT diff --git a/phpBB/install/schemas/mysql_schema.sql b/phpBB/install/schemas/mysql_schema.sql index 2d91b0259e..2863536e92 100644 --- a/phpBB/install/schemas/mysql_schema.sql +++ b/phpBB/install/schemas/mysql_schema.sql @@ -152,7 +152,8 @@ CREATE TABLE phpbb_config ( config_value varchar(255) DEFAULT '' NOT NULL, is_dynamic tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, PRIMARY KEY (config_name), - KEY is_dynamic (is_dynamic) + KEY is_dynamic (is_dynamic), + KEY config_name (config_name) ) CHARACTER SET `utf8` COLLATE `utf8_bin`; @@ -297,6 +298,7 @@ CREATE TABLE phpbb_groups ( group_type tinyint(4) DEFAULT '1' NOT NULL, group_founder_manage tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, group_name varchar(255) DEFAULT '' NOT NULL, + group_name_clean varchar(255) DEFAULT '' NOT NULL, group_desc text NOT NULL, group_desc_bitfield varchar(255) DEFAULT '' NOT NULL, group_desc_options int(11) UNSIGNED DEFAULT '7' NOT NULL, @@ -990,7 +992,8 @@ CREATE TABLE phpbb_zebra ( zebra_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, friend tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, foe tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, - PRIMARY KEY (user_id, zebra_id) + PRIMARY KEY (user_id, zebra_id), + KEY zebra_user (zebra_id, user_id) ) CHARACTER SET `utf8` COLLATE `utf8_bin`; diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql index 275de3d488..dd1f45f530 100644 --- a/phpBB/install/schemas/oracle_schema.sql +++ b/phpBB/install/schemas/oracle_schema.sql @@ -329,6 +329,8 @@ CREATE TABLE phpbb_config ( CREATE INDEX phpbb_config_is_dynamic ON phpbb_config (is_dynamic) / +CREATE INDEX phpbb_config_config_name ON phpbb_config (config_name) +/ /* Table: 'phpbb_confirm' @@ -586,7 +588,8 @@ CREATE TABLE phpbb_groups ( group_id number(8) NOT NULL, group_type number(4) DEFAULT '1' NOT NULL, group_founder_manage number(1) DEFAULT '0' NOT NULL, - group_name varchar2(255) DEFAULT '' , + group_name varchar2(765) DEFAULT '' , + group_name_clean varchar2(765) DEFAULT '' , group_desc clob DEFAULT '' , group_desc_bitfield varchar2(255) DEFAULT '' , group_desc_options number(11) DEFAULT '7' NOT NULL, @@ -1707,8 +1710,8 @@ CREATE TABLE phpbb_users ( user_perm_from number(8) DEFAULT '0' NOT NULL, user_ip varchar2(40) DEFAULT '' , user_regdate number(11) DEFAULT '0' NOT NULL, - username varchar2(255) DEFAULT '' , - username_clean varchar2(255) DEFAULT '' , + username varchar2(765) DEFAULT '' , + username_clean varchar2(765) DEFAULT '' , user_password varchar2(120) DEFAULT '' , user_passchg number(11) DEFAULT '0' NOT NULL, user_pass_convert number(1) DEFAULT '0' NOT NULL, @@ -1871,4 +1874,6 @@ CREATE TABLE phpbb_zebra ( ) / +CREATE INDEX phpbb_zebra_zebra_user ON phpbb_zebra (zebra_id, user_id) +/ diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql index 1f20c17583..376dc70d56 100644 --- a/phpBB/install/schemas/postgres_schema.sql +++ b/phpBB/install/schemas/postgres_schema.sql @@ -6,80 +6,6 @@ BEGIN; -/* - Domain definition -*/ -CREATE DOMAIN varchar_ci AS varchar(255) NOT NULL DEFAULT ''::character varying; - -/* - Operation Functions -*/ -CREATE FUNCTION _varchar_ci_equal(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) = LOWER($2)' LANGUAGE SQL STRICT; -CREATE FUNCTION _varchar_ci_not_equal(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) != LOWER($2)' LANGUAGE SQL STRICT; -CREATE FUNCTION _varchar_ci_less_than(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) < LOWER($2)' LANGUAGE SQL STRICT; -CREATE FUNCTION _varchar_ci_less_equal(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) <= LOWER($2)' LANGUAGE SQL STRICT; -CREATE FUNCTION _varchar_ci_greater_than(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) > LOWER($2)' LANGUAGE SQL STRICT; -CREATE FUNCTION _varchar_ci_greater_equals(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) >= LOWER($2)' LANGUAGE SQL STRICT; - -/* - Operators -*/ -CREATE OPERATOR <( - PROCEDURE = _varchar_ci_less_than, - LEFTARG = varchar_ci, - RIGHTARG = varchar_ci, - COMMUTATOR = >, - NEGATOR = >=, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); - -CREATE OPERATOR <=( - PROCEDURE = _varchar_ci_less_equal, - LEFTARG = varchar_ci, - RIGHTARG = varchar_ci, - COMMUTATOR = >=, - NEGATOR = >, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); - -CREATE OPERATOR >( - PROCEDURE = _varchar_ci_greater_than, - LEFTARG = varchar_ci, - RIGHTARG = varchar_ci, - COMMUTATOR = <, - NEGATOR = <=, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel); - -CREATE OPERATOR >=( - PROCEDURE = _varchar_ci_greater_equals, - LEFTARG = varchar_ci, - RIGHTARG = varchar_ci, - COMMUTATOR = <=, - NEGATOR = <, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel); - -CREATE OPERATOR <>( - PROCEDURE = _varchar_ci_not_equal, - LEFTARG = varchar_ci, - RIGHTARG = varchar_ci, - COMMUTATOR = <>, - NEGATOR = =, - RESTRICT = neqsel, - JOIN = neqjoinsel); - -CREATE OPERATOR =( - PROCEDURE = _varchar_ci_equal, - LEFTARG = varchar_ci, - RIGHTARG = varchar_ci, - COMMUTATOR = =, - NEGATOR = <>, - RESTRICT = eqsel, - JOIN = eqjoinsel, - HASHES, - MERGES, - SORT1= <); /* Table: 'phpbb_attachments' @@ -90,9 +16,9 @@ CREATE TABLE phpbb_attachments ( attach_id INT4 DEFAULT nextval('phpbb_attachments_seq'), post_msg_id INT4 DEFAULT '0' NOT NULL CHECK (post_msg_id >= 0), topic_id INT4 DEFAULT '0' NOT NULL CHECK (topic_id >= 0), - in_message INT2 DEFAULT '0' NOT NULL CHECK (in_message >= 0), + in_message boolean DEFAULT '0' NOT NULL CHECK (in_message >= 0), poster_id INT4 DEFAULT '0' NOT NULL CHECK (poster_id >= 0), - is_orphan INT2 DEFAULT '1' NOT NULL CHECK (is_orphan >= 0), + is_orphan boolean DEFAULT '1' NOT NULL CHECK (is_orphan >= 0), physical_filename varchar(255) DEFAULT '' NOT NULL, real_filename varchar(255) DEFAULT '' NOT NULL, download_count INT4 DEFAULT '0' NOT NULL CHECK (download_count >= 0), @@ -101,7 +27,7 @@ CREATE TABLE phpbb_attachments ( mimetype varchar(100) DEFAULT '' NOT NULL, filesize INT4 DEFAULT '0' NOT NULL CHECK (filesize >= 0), filetime INT4 DEFAULT '0' NOT NULL CHECK (filetime >= 0), - thumbnail INT2 DEFAULT '0' NOT NULL CHECK (thumbnail >= 0), + thumbnail boolean DEFAULT '0' NOT NULL CHECK (thumbnail >= 0), PRIMARY KEY (attach_id) ); @@ -134,9 +60,9 @@ CREATE SEQUENCE phpbb_acl_options_seq; CREATE TABLE phpbb_acl_options ( auth_option_id INT4 DEFAULT nextval('phpbb_acl_options_seq'), auth_option varchar(50) DEFAULT '' NOT NULL, - is_global INT2 DEFAULT '0' NOT NULL CHECK (is_global >= 0), - is_local INT2 DEFAULT '0' NOT NULL CHECK (is_local >= 0), - founder_only INT2 DEFAULT '0' NOT NULL CHECK (founder_only >= 0), + is_global boolean DEFAULT '0' NOT NULL CHECK (is_global >= 0), + is_local boolean DEFAULT '0' NOT NULL CHECK (is_local >= 0), + founder_only boolean DEFAULT '0' NOT NULL CHECK (founder_only >= 0), PRIMARY KEY (auth_option_id) ); @@ -198,7 +124,7 @@ CREATE TABLE phpbb_banlist ( ban_email varchar(100) DEFAULT '' NOT NULL, ban_start INT4 DEFAULT '0' NOT NULL CHECK (ban_start >= 0), ban_end INT4 DEFAULT '0' NOT NULL CHECK (ban_end >= 0), - ban_exclude INT2 DEFAULT '0' NOT NULL CHECK (ban_exclude >= 0), + ban_exclude boolean DEFAULT '0' NOT NULL CHECK (ban_exclude >= 0), ban_reason varchar(255) DEFAULT '' NOT NULL, ban_give_reason varchar(255) DEFAULT '' NOT NULL, PRIMARY KEY (ban_id) @@ -216,7 +142,7 @@ CREATE TABLE phpbb_bbcodes ( bbcode_id INT2 DEFAULT '0' NOT NULL, bbcode_tag varchar(16) DEFAULT '' NOT NULL, bbcode_helpline varchar(255) DEFAULT '' NOT NULL, - display_on_posting INT2 DEFAULT '0' NOT NULL CHECK (display_on_posting >= 0), + display_on_posting boolean DEFAULT '0' NOT NULL CHECK (display_on_posting >= 0), bbcode_match varchar(4000) DEFAULT '' NOT NULL, bbcode_tpl TEXT DEFAULT '' NOT NULL, first_pass_match TEXT DEFAULT '' NOT NULL, @@ -245,7 +171,7 @@ CREATE SEQUENCE phpbb_bots_seq; CREATE TABLE phpbb_bots ( bot_id INT4 DEFAULT nextval('phpbb_bots_seq'), - bot_active INT2 DEFAULT '1' NOT NULL CHECK (bot_active >= 0), + bot_active boolean DEFAULT '1' NOT NULL CHECK (bot_active >= 0), bot_name varchar(255) DEFAULT '' NOT NULL, user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), bot_agent varchar(255) DEFAULT '' NOT NULL, @@ -261,11 +187,12 @@ CREATE INDEX phpbb_bots_bot_active ON phpbb_bots (bot_active); CREATE TABLE phpbb_config ( config_name varchar(255) DEFAULT '' NOT NULL, config_value varchar(255) DEFAULT '' NOT NULL, - is_dynamic INT2 DEFAULT '0' NOT NULL CHECK (is_dynamic >= 0), + is_dynamic boolean DEFAULT '0' NOT NULL CHECK (is_dynamic >= 0), PRIMARY KEY (config_name) ); CREATE INDEX phpbb_config_is_dynamic ON phpbb_config (is_dynamic); +CREATE INDEX phpbb_config_config_name ON phpbb_config (config_name); /* Table: 'phpbb_confirm' @@ -333,12 +260,12 @@ CREATE TABLE phpbb_extension_groups ( group_id INT4 DEFAULT nextval('phpbb_extension_groups_seq'), group_name varchar(255) DEFAULT '' NOT NULL, cat_id INT2 DEFAULT '0' NOT NULL, - allow_group INT2 DEFAULT '0' NOT NULL CHECK (allow_group >= 0), - download_mode INT2 DEFAULT '1' NOT NULL CHECK (download_mode >= 0), + allow_group boolean DEFAULT '0' NOT NULL CHECK (allow_group >= 0), + download_mode boolean DEFAULT '1' NOT NULL CHECK (download_mode >= 0), upload_icon varchar(255) DEFAULT '' NOT NULL, max_filesize INT4 DEFAULT '0' NOT NULL CHECK (max_filesize >= 0), allowed_forums varchar(8000) DEFAULT '' NOT NULL, - allow_in_pm INT2 DEFAULT '0' NOT NULL CHECK (allow_in_pm >= 0), + allow_in_pm boolean DEFAULT '0' NOT NULL CHECK (allow_in_pm >= 0), PRIMARY KEY (group_id) ); @@ -381,10 +308,10 @@ CREATE TABLE phpbb_forums ( forum_last_poster_name varchar(255) DEFAULT '' NOT NULL, forum_last_poster_colour varchar(6) DEFAULT '' NOT NULL, forum_flags INT2 DEFAULT '32' NOT NULL, - display_on_index INT2 DEFAULT '1' NOT NULL CHECK (display_on_index >= 0), - enable_indexing INT2 DEFAULT '1' NOT NULL CHECK (enable_indexing >= 0), - enable_icons INT2 DEFAULT '1' NOT NULL CHECK (enable_icons >= 0), - enable_prune INT2 DEFAULT '0' NOT NULL CHECK (enable_prune >= 0), + display_on_index boolean DEFAULT '1' NOT NULL CHECK (display_on_index >= 0), + enable_indexing boolean DEFAULT '1' NOT NULL CHECK (enable_indexing >= 0), + enable_icons boolean DEFAULT '1' NOT NULL CHECK (enable_icons >= 0), + enable_prune boolean DEFAULT '0' NOT NULL CHECK (enable_prune >= 0), prune_next INT4 DEFAULT '0' NOT NULL CHECK (prune_next >= 0), prune_days INT4 DEFAULT '0' NOT NULL CHECK (prune_days >= 0), prune_viewed INT4 DEFAULT '0' NOT NULL CHECK (prune_viewed >= 0), @@ -423,7 +350,7 @@ CREATE TABLE phpbb_forums_track ( CREATE TABLE phpbb_forums_watch ( forum_id INT4 DEFAULT '0' NOT NULL CHECK (forum_id >= 0), user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), - notify_status INT2 DEFAULT '0' NOT NULL CHECK (notify_status >= 0) + notify_status boolean DEFAULT '0' NOT NULL CHECK (notify_status >= 0) ); CREATE INDEX phpbb_forums_watch_forum_id ON phpbb_forums_watch (forum_id); @@ -438,13 +365,14 @@ CREATE SEQUENCE phpbb_groups_seq; CREATE TABLE phpbb_groups ( group_id INT4 DEFAULT nextval('phpbb_groups_seq'), group_type INT2 DEFAULT '1' NOT NULL, - group_founder_manage INT2 DEFAULT '0' NOT NULL CHECK (group_founder_manage >= 0), - group_name varchar_ci DEFAULT '' NOT NULL, + group_founder_manage boolean DEFAULT '0' NOT NULL CHECK (group_founder_manage >= 0), + group_name varchar(255) DEFAULT '' NOT NULL, + group_name_clean varchar(255) DEFAULT '' NOT NULL, group_desc varchar(4000) DEFAULT '' NOT NULL, group_desc_bitfield varchar(255) DEFAULT '' NOT NULL, group_desc_options INT4 DEFAULT '7' NOT NULL CHECK (group_desc_options >= 0), group_desc_uid varchar(8) DEFAULT '' NOT NULL, - group_display INT2 DEFAULT '0' NOT NULL CHECK (group_display >= 0), + group_display boolean DEFAULT '0' NOT NULL CHECK (group_display >= 0), group_avatar varchar(255) DEFAULT '' NOT NULL, group_avatar_type INT2 DEFAULT '0' NOT NULL, group_avatar_width INT2 DEFAULT '0' NOT NULL CHECK (group_avatar_width >= 0), @@ -452,9 +380,9 @@ CREATE TABLE phpbb_groups ( group_rank INT4 DEFAULT '0' NOT NULL CHECK (group_rank >= 0), group_colour varchar(6) DEFAULT '' NOT NULL, group_sig_chars INT4 DEFAULT '0' NOT NULL CHECK (group_sig_chars >= 0), - group_receive_pm INT2 DEFAULT '0' NOT NULL CHECK (group_receive_pm >= 0), + group_receive_pm boolean DEFAULT '0' NOT NULL CHECK (group_receive_pm >= 0), group_message_limit INT4 DEFAULT '0' NOT NULL CHECK (group_message_limit >= 0), - group_legend INT2 DEFAULT '1' NOT NULL CHECK (group_legend >= 0), + group_legend boolean DEFAULT '1' NOT NULL CHECK (group_legend >= 0), PRIMARY KEY (group_id) ); @@ -471,7 +399,7 @@ CREATE TABLE phpbb_icons ( icons_width INT2 DEFAULT '0' NOT NULL, icons_height INT2 DEFAULT '0' NOT NULL, icons_order INT4 DEFAULT '0' NOT NULL CHECK (icons_order >= 0), - display_on_posting INT2 DEFAULT '1' NOT NULL CHECK (display_on_posting >= 0), + display_on_posting boolean DEFAULT '1' NOT NULL CHECK (display_on_posting >= 0), PRIMARY KEY (icons_id) ); @@ -528,7 +456,7 @@ CREATE TABLE phpbb_moderator_cache ( username varchar(255) DEFAULT '' NOT NULL, group_id INT4 DEFAULT '0' NOT NULL CHECK (group_id >= 0), group_name varchar(255) DEFAULT '' NOT NULL, - display_on_index INT2 DEFAULT '1' NOT NULL CHECK (display_on_index >= 0) + display_on_index boolean DEFAULT '1' NOT NULL CHECK (display_on_index >= 0) ); CREATE INDEX phpbb_moderator_cache_disp_idx ON phpbb_moderator_cache (display_on_index); @@ -541,8 +469,8 @@ CREATE SEQUENCE phpbb_modules_seq; CREATE TABLE phpbb_modules ( module_id INT4 DEFAULT nextval('phpbb_modules_seq'), - module_enabled INT2 DEFAULT '1' NOT NULL CHECK (module_enabled >= 0), - module_display INT2 DEFAULT '1' NOT NULL CHECK (module_display >= 0), + module_enabled boolean DEFAULT '1' NOT NULL CHECK (module_enabled >= 0), + module_display boolean DEFAULT '1' NOT NULL CHECK (module_display >= 0), module_basename varchar(255) DEFAULT '' NOT NULL, module_class varchar(10) DEFAULT '' NOT NULL, parent_id INT4 DEFAULT '0' NOT NULL CHECK (parent_id >= 0), @@ -598,25 +526,25 @@ CREATE TABLE phpbb_posts ( icon_id INT4 DEFAULT '0' NOT NULL CHECK (icon_id >= 0), poster_ip varchar(40) DEFAULT '' NOT NULL, post_time INT4 DEFAULT '0' NOT NULL CHECK (post_time >= 0), - post_approved INT2 DEFAULT '1' NOT NULL CHECK (post_approved >= 0), - post_reported INT2 DEFAULT '0' NOT NULL CHECK (post_reported >= 0), - enable_bbcode INT2 DEFAULT '1' NOT NULL CHECK (enable_bbcode >= 0), - enable_smilies INT2 DEFAULT '1' NOT NULL CHECK (enable_smilies >= 0), - enable_magic_url INT2 DEFAULT '1' NOT NULL CHECK (enable_magic_url >= 0), - enable_sig INT2 DEFAULT '1' NOT NULL CHECK (enable_sig >= 0), + post_approved boolean DEFAULT '1' NOT NULL CHECK (post_approved >= 0), + post_reported boolean DEFAULT '0' NOT NULL CHECK (post_reported >= 0), + enable_bbcode boolean DEFAULT '1' NOT NULL CHECK (enable_bbcode >= 0), + enable_smilies boolean DEFAULT '1' NOT NULL CHECK (enable_smilies >= 0), + enable_magic_url boolean DEFAULT '1' NOT NULL CHECK (enable_magic_url >= 0), + enable_sig boolean DEFAULT '1' NOT NULL CHECK (enable_sig >= 0), post_username varchar(255) DEFAULT '' NOT NULL, post_subject varchar(100) DEFAULT '' NOT NULL, post_text TEXT DEFAULT '' NOT NULL, post_checksum varchar(32) DEFAULT '' NOT NULL, - post_attachment INT2 DEFAULT '0' NOT NULL CHECK (post_attachment >= 0), + post_attachment boolean DEFAULT '0' NOT NULL CHECK (post_attachment >= 0), bbcode_bitfield varchar(255) DEFAULT '' NOT NULL, bbcode_uid varchar(8) DEFAULT '' NOT NULL, - post_postcount INT2 DEFAULT '1' NOT NULL CHECK (post_postcount >= 0), + post_postcount boolean DEFAULT '1' NOT NULL CHECK (post_postcount >= 0), post_edit_time INT4 DEFAULT '0' NOT NULL CHECK (post_edit_time >= 0), post_edit_reason varchar(255) DEFAULT '' NOT NULL, post_edit_user INT4 DEFAULT '0' NOT NULL CHECK (post_edit_user >= 0), post_edit_count INT2 DEFAULT '0' NOT NULL CHECK (post_edit_count >= 0), - post_edit_locked INT2 DEFAULT '0' NOT NULL CHECK (post_edit_locked >= 0), + post_edit_locked boolean DEFAULT '0' NOT NULL CHECK (post_edit_locked >= 0), PRIMARY KEY (post_id) ); @@ -639,15 +567,15 @@ CREATE TABLE phpbb_privmsgs ( icon_id INT4 DEFAULT '0' NOT NULL CHECK (icon_id >= 0), author_ip varchar(40) DEFAULT '' NOT NULL, message_time INT4 DEFAULT '0' NOT NULL CHECK (message_time >= 0), - enable_bbcode INT2 DEFAULT '1' NOT NULL CHECK (enable_bbcode >= 0), - enable_smilies INT2 DEFAULT '1' NOT NULL CHECK (enable_smilies >= 0), - enable_magic_url INT2 DEFAULT '1' NOT NULL CHECK (enable_magic_url >= 0), - enable_sig INT2 DEFAULT '1' NOT NULL CHECK (enable_sig >= 0), + enable_bbcode boolean DEFAULT '1' NOT NULL CHECK (enable_bbcode >= 0), + enable_smilies boolean DEFAULT '1' NOT NULL CHECK (enable_smilies >= 0), + enable_magic_url boolean DEFAULT '1' NOT NULL CHECK (enable_magic_url >= 0), + enable_sig boolean DEFAULT '1' NOT NULL CHECK (enable_sig >= 0), message_subject varchar(100) DEFAULT '' NOT NULL, message_text TEXT DEFAULT '' NOT NULL, message_edit_reason varchar(255) DEFAULT '' NOT NULL, message_edit_user INT4 DEFAULT '0' NOT NULL CHECK (message_edit_user >= 0), - message_attachment INT2 DEFAULT '0' NOT NULL CHECK (message_attachment >= 0), + message_attachment boolean DEFAULT '0' NOT NULL CHECK (message_attachment >= 0), bbcode_bitfield varchar(255) DEFAULT '' NOT NULL, bbcode_uid varchar(8) DEFAULT '' NOT NULL, message_edit_time INT4 DEFAULT '0' NOT NULL CHECK (message_edit_time >= 0), @@ -704,12 +632,12 @@ CREATE TABLE phpbb_privmsgs_to ( msg_id INT4 DEFAULT '0' NOT NULL CHECK (msg_id >= 0), user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), author_id INT4 DEFAULT '0' NOT NULL CHECK (author_id >= 0), - pm_deleted INT2 DEFAULT '0' NOT NULL CHECK (pm_deleted >= 0), - pm_new INT2 DEFAULT '1' NOT NULL CHECK (pm_new >= 0), - pm_unread INT2 DEFAULT '1' NOT NULL CHECK (pm_unread >= 0), - pm_replied INT2 DEFAULT '0' NOT NULL CHECK (pm_replied >= 0), - pm_marked INT2 DEFAULT '0' NOT NULL CHECK (pm_marked >= 0), - pm_forwarded INT2 DEFAULT '0' NOT NULL CHECK (pm_forwarded >= 0), + pm_deleted boolean DEFAULT '0' NOT NULL CHECK (pm_deleted >= 0), + pm_new boolean DEFAULT '1' NOT NULL CHECK (pm_new >= 0), + pm_unread boolean DEFAULT '1' NOT NULL CHECK (pm_unread >= 0), + pm_replied boolean DEFAULT '0' NOT NULL CHECK (pm_replied >= 0), + pm_marked boolean DEFAULT '0' NOT NULL CHECK (pm_marked >= 0), + pm_forwarded boolean DEFAULT '0' NOT NULL CHECK (pm_forwarded >= 0), folder_id INT4 DEFAULT '0' NOT NULL ); @@ -733,11 +661,11 @@ CREATE TABLE phpbb_profile_fields ( field_novalue varchar(255) DEFAULT '' NOT NULL, field_default_value varchar(255) DEFAULT '' NOT NULL, field_validation varchar(20) DEFAULT '' NOT NULL, - field_required INT2 DEFAULT '0' NOT NULL CHECK (field_required >= 0), - field_show_on_reg INT2 DEFAULT '0' NOT NULL CHECK (field_show_on_reg >= 0), - field_hide INT2 DEFAULT '0' NOT NULL CHECK (field_hide >= 0), - field_no_view INT2 DEFAULT '0' NOT NULL CHECK (field_no_view >= 0), - field_active INT2 DEFAULT '0' NOT NULL CHECK (field_active >= 0), + field_required boolean DEFAULT '0' NOT NULL CHECK (field_required >= 0), + field_show_on_reg boolean DEFAULT '0' NOT NULL CHECK (field_show_on_reg >= 0), + field_hide boolean DEFAULT '0' NOT NULL CHECK (field_hide >= 0), + field_no_view boolean DEFAULT '0' NOT NULL CHECK (field_no_view >= 0), + field_active boolean DEFAULT '0' NOT NULL CHECK (field_active >= 0), field_order INT4 DEFAULT '0' NOT NULL CHECK (field_order >= 0), PRIMARY KEY (field_id) ); @@ -789,7 +717,7 @@ CREATE TABLE phpbb_ranks ( rank_id INT4 DEFAULT nextval('phpbb_ranks_seq'), rank_title varchar(255) DEFAULT '' NOT NULL, rank_min INT4 DEFAULT '0' NOT NULL CHECK (rank_min >= 0), - rank_special INT2 DEFAULT '0' NOT NULL CHECK (rank_special >= 0), + rank_special boolean DEFAULT '0' NOT NULL CHECK (rank_special >= 0), rank_image varchar(255) DEFAULT '' NOT NULL, PRIMARY KEY (rank_id) ); @@ -805,8 +733,8 @@ CREATE TABLE phpbb_reports ( reason_id INT2 DEFAULT '0' NOT NULL CHECK (reason_id >= 0), post_id INT4 DEFAULT '0' NOT NULL CHECK (post_id >= 0), user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), - user_notify INT2 DEFAULT '0' NOT NULL CHECK (user_notify >= 0), - report_closed INT2 DEFAULT '0' NOT NULL CHECK (report_closed >= 0), + user_notify boolean DEFAULT '0' NOT NULL CHECK (user_notify >= 0), + report_closed boolean DEFAULT '0' NOT NULL CHECK (report_closed >= 0), report_time INT4 DEFAULT '0' NOT NULL CHECK (report_time >= 0), report_text TEXT DEFAULT '' NOT NULL, PRIMARY KEY (report_id) @@ -847,7 +775,7 @@ CREATE SEQUENCE phpbb_search_wordlist_seq; CREATE TABLE phpbb_search_wordlist ( word_id INT4 DEFAULT nextval('phpbb_search_wordlist_seq'), word_text varchar(255) DEFAULT '' NOT NULL, - word_common INT2 DEFAULT '0' NOT NULL CHECK (word_common >= 0), + word_common boolean DEFAULT '0' NOT NULL CHECK (word_common >= 0), word_count INT4 DEFAULT '0' NOT NULL CHECK (word_count >= 0), PRIMARY KEY (word_id) ); @@ -861,7 +789,7 @@ CREATE INDEX phpbb_search_wordlist_wrd_cnt ON phpbb_search_wordlist (word_count) CREATE TABLE phpbb_search_wordmatch ( post_id INT4 DEFAULT '0' NOT NULL CHECK (post_id >= 0), word_id INT4 DEFAULT '0' NOT NULL CHECK (word_id >= 0), - title_match INT2 DEFAULT '0' NOT NULL CHECK (title_match >= 0) + title_match boolean DEFAULT '0' NOT NULL CHECK (title_match >= 0) ); CREATE UNIQUE INDEX phpbb_search_wordmatch_unq_mtch ON phpbb_search_wordmatch (word_id, post_id, title_match); @@ -881,9 +809,9 @@ CREATE TABLE phpbb_sessions ( session_browser varchar(150) DEFAULT '' NOT NULL, session_forwarded_for varchar(255) DEFAULT '' NOT NULL, session_page varchar(255) DEFAULT '' NOT NULL, - session_viewonline INT2 DEFAULT '1' NOT NULL CHECK (session_viewonline >= 0), - session_autologin INT2 DEFAULT '0' NOT NULL CHECK (session_autologin >= 0), - session_admin INT2 DEFAULT '0' NOT NULL CHECK (session_admin >= 0), + session_viewonline boolean DEFAULT '1' NOT NULL CHECK (session_viewonline >= 0), + session_autologin boolean DEFAULT '0' NOT NULL CHECK (session_autologin >= 0), + session_admin boolean DEFAULT '0' NOT NULL CHECK (session_admin >= 0), PRIMARY KEY (session_id) ); @@ -912,7 +840,7 @@ CREATE TABLE phpbb_sitelist ( site_id INT4 DEFAULT nextval('phpbb_sitelist_seq'), site_ip varchar(40) DEFAULT '' NOT NULL, site_hostname varchar(255) DEFAULT '' NOT NULL, - ip_exclude INT2 DEFAULT '0' NOT NULL CHECK (ip_exclude >= 0), + ip_exclude boolean DEFAULT '0' NOT NULL CHECK (ip_exclude >= 0), PRIMARY KEY (site_id) ); @@ -930,7 +858,7 @@ CREATE TABLE phpbb_smilies ( smiley_width INT2 DEFAULT '0' NOT NULL CHECK (smiley_width >= 0), smiley_height INT2 DEFAULT '0' NOT NULL CHECK (smiley_height >= 0), smiley_order INT4 DEFAULT '0' NOT NULL CHECK (smiley_order >= 0), - display_on_posting INT2 DEFAULT '1' NOT NULL CHECK (display_on_posting >= 0), + display_on_posting boolean DEFAULT '1' NOT NULL CHECK (display_on_posting >= 0), PRIMARY KEY (smiley_id) ); @@ -945,7 +873,7 @@ CREATE TABLE phpbb_styles ( style_id INT2 DEFAULT nextval('phpbb_styles_seq'), style_name varchar(255) DEFAULT '' NOT NULL, style_copyright varchar(255) DEFAULT '' NOT NULL, - style_active INT2 DEFAULT '1' NOT NULL CHECK (style_active >= 0), + style_active boolean DEFAULT '1' NOT NULL CHECK (style_active >= 0), template_id INT2 DEFAULT '0' NOT NULL CHECK (template_id >= 0), theme_id INT2 DEFAULT '0' NOT NULL CHECK (theme_id >= 0), imageset_id INT2 DEFAULT '0' NOT NULL CHECK (imageset_id >= 0), @@ -968,7 +896,7 @@ CREATE TABLE phpbb_styles_template ( template_copyright varchar(255) DEFAULT '' NOT NULL, template_path varchar(100) DEFAULT '' NOT NULL, bbcode_bitfield varchar(255) DEFAULT 'kNg=' NOT NULL, - template_storedb INT2 DEFAULT '0' NOT NULL CHECK (template_storedb >= 0), + template_storedb boolean DEFAULT '0' NOT NULL CHECK (template_storedb >= 0), PRIMARY KEY (template_id) ); @@ -998,7 +926,7 @@ CREATE TABLE phpbb_styles_theme ( theme_name varchar(255) DEFAULT '' NOT NULL, theme_copyright varchar(255) DEFAULT '' NOT NULL, theme_path varchar(100) DEFAULT '' NOT NULL, - theme_storedb INT2 DEFAULT '0' NOT NULL CHECK (theme_storedb >= 0), + theme_storedb boolean DEFAULT '0' NOT NULL CHECK (theme_storedb >= 0), theme_mtime INT4 DEFAULT '0' NOT NULL CHECK (theme_mtime >= 0), theme_data TEXT DEFAULT '' NOT NULL, PRIMARY KEY (theme_id) @@ -1048,9 +976,9 @@ CREATE TABLE phpbb_topics ( topic_id INT4 DEFAULT nextval('phpbb_topics_seq'), forum_id INT4 DEFAULT '0' NOT NULL CHECK (forum_id >= 0), icon_id INT4 DEFAULT '0' NOT NULL CHECK (icon_id >= 0), - topic_attachment INT2 DEFAULT '0' NOT NULL CHECK (topic_attachment >= 0), - topic_approved INT2 DEFAULT '1' NOT NULL CHECK (topic_approved >= 0), - topic_reported INT2 DEFAULT '0' NOT NULL CHECK (topic_reported >= 0), + topic_attachment boolean DEFAULT '0' NOT NULL CHECK (topic_attachment >= 0), + topic_approved boolean DEFAULT '1' NOT NULL CHECK (topic_approved >= 0), + topic_reported boolean DEFAULT '0' NOT NULL CHECK (topic_reported >= 0), topic_title varchar(100) DEFAULT '' NOT NULL, topic_poster INT4 DEFAULT '0' NOT NULL CHECK (topic_poster >= 0), topic_time INT4 DEFAULT '0' NOT NULL CHECK (topic_time >= 0), @@ -1071,14 +999,14 @@ CREATE TABLE phpbb_topics ( topic_last_post_time INT4 DEFAULT '0' NOT NULL CHECK (topic_last_post_time >= 0), topic_last_view_time INT4 DEFAULT '0' NOT NULL CHECK (topic_last_view_time >= 0), topic_moved_id INT4 DEFAULT '0' NOT NULL CHECK (topic_moved_id >= 0), - topic_bumped INT2 DEFAULT '0' NOT NULL CHECK (topic_bumped >= 0), + topic_bumped boolean DEFAULT '0' NOT NULL CHECK (topic_bumped >= 0), topic_bumper INT4 DEFAULT '0' NOT NULL CHECK (topic_bumper >= 0), poll_title varchar(255) DEFAULT '' NOT NULL, poll_start INT4 DEFAULT '0' NOT NULL CHECK (poll_start >= 0), poll_length INT4 DEFAULT '0' NOT NULL CHECK (poll_length >= 0), poll_max_options INT2 DEFAULT '1' NOT NULL, poll_last_vote INT4 DEFAULT '0' NOT NULL CHECK (poll_last_vote >= 0), - poll_vote_change INT2 DEFAULT '0' NOT NULL CHECK (poll_vote_change >= 0), + poll_vote_change boolean DEFAULT '0' NOT NULL CHECK (poll_vote_change >= 0), PRIMARY KEY (topic_id) ); @@ -1108,7 +1036,7 @@ CREATE INDEX phpbb_topics_track_forum_id ON phpbb_topics_track (forum_id); CREATE TABLE phpbb_topics_posted ( user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), topic_id INT4 DEFAULT '0' NOT NULL CHECK (topic_id >= 0), - topic_posted INT2 DEFAULT '0' NOT NULL CHECK (topic_posted >= 0), + topic_posted boolean DEFAULT '0' NOT NULL CHECK (topic_posted >= 0), PRIMARY KEY (user_id, topic_id) ); @@ -1119,7 +1047,7 @@ CREATE TABLE phpbb_topics_posted ( CREATE TABLE phpbb_topics_watch ( topic_id INT4 DEFAULT '0' NOT NULL CHECK (topic_id >= 0), user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), - notify_status INT2 DEFAULT '0' NOT NULL CHECK (notify_status >= 0) + notify_status boolean DEFAULT '0' NOT NULL CHECK (notify_status >= 0) ); CREATE INDEX phpbb_topics_watch_topic_id ON phpbb_topics_watch (topic_id); @@ -1132,8 +1060,8 @@ CREATE INDEX phpbb_topics_watch_notify_stat ON phpbb_topics_watch (notify_status CREATE TABLE phpbb_user_group ( group_id INT4 DEFAULT '0' NOT NULL CHECK (group_id >= 0), user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), - group_leader INT2 DEFAULT '0' NOT NULL CHECK (group_leader >= 0), - user_pending INT2 DEFAULT '1' NOT NULL CHECK (user_pending >= 0) + group_leader boolean DEFAULT '0' NOT NULL CHECK (group_leader >= 0), + user_pending boolean DEFAULT '1' NOT NULL CHECK (user_pending >= 0) ); CREATE INDEX phpbb_user_group_group_id ON phpbb_user_group (group_id); @@ -1153,11 +1081,11 @@ CREATE TABLE phpbb_users ( user_perm_from INT4 DEFAULT '0' NOT NULL CHECK (user_perm_from >= 0), user_ip varchar(40) DEFAULT '' NOT NULL, user_regdate INT4 DEFAULT '0' NOT NULL CHECK (user_regdate >= 0), - username varchar_ci DEFAULT '' NOT NULL, - username_clean varchar_ci DEFAULT '' NOT NULL, + username varchar(255) DEFAULT '' NOT NULL, + username_clean varchar(255) DEFAULT '' NOT NULL, user_password varchar(40) DEFAULT '' NOT NULL, user_passchg INT4 DEFAULT '0' NOT NULL CHECK (user_passchg >= 0), - user_pass_convert INT2 DEFAULT '0' NOT NULL CHECK (user_pass_convert >= 0), + user_pass_convert boolean DEFAULT '0' NOT NULL CHECK (user_pass_convert >= 0), user_email varchar(100) DEFAULT '' NOT NULL, user_email_hash INT8 DEFAULT '0' NOT NULL, user_birthday varchar(10) DEFAULT '' NOT NULL, @@ -1175,7 +1103,7 @@ CREATE TABLE phpbb_users ( user_posts INT4 DEFAULT '0' NOT NULL CHECK (user_posts >= 0), user_lang varchar(30) DEFAULT '' NOT NULL, user_timezone decimal(5,2) DEFAULT '0' NOT NULL, - user_dst INT2 DEFAULT '0' NOT NULL CHECK (user_dst >= 0), + user_dst boolean DEFAULT '0' NOT NULL CHECK (user_dst >= 0), user_dateformat varchar(30) DEFAULT 'd M Y H:i' NOT NULL, user_style INT2 DEFAULT '0' NOT NULL CHECK (user_style >= 0), user_rank INT4 DEFAULT '0' NOT NULL CHECK (user_rank >= 0), @@ -1183,7 +1111,7 @@ CREATE TABLE phpbb_users ( user_new_privmsg INT4 DEFAULT '0' NOT NULL, user_unread_privmsg INT4 DEFAULT '0' NOT NULL, user_last_privmsg INT4 DEFAULT '0' NOT NULL CHECK (user_last_privmsg >= 0), - user_message_rules INT2 DEFAULT '0' NOT NULL CHECK (user_message_rules >= 0), + user_message_rules boolean DEFAULT '0' NOT NULL CHECK (user_message_rules >= 0), user_full_folder INT4 DEFAULT '-3' NOT NULL, user_emailtime INT4 DEFAULT '0' NOT NULL CHECK (user_emailtime >= 0), user_topic_show_days INT2 DEFAULT '0' NOT NULL CHECK (user_topic_show_days >= 0), @@ -1192,13 +1120,13 @@ CREATE TABLE phpbb_users ( user_post_show_days INT2 DEFAULT '0' NOT NULL CHECK (user_post_show_days >= 0), user_post_sortby_type varchar(1) DEFAULT 't' NOT NULL, user_post_sortby_dir varchar(1) DEFAULT 'a' NOT NULL, - user_notify INT2 DEFAULT '0' NOT NULL CHECK (user_notify >= 0), - user_notify_pm INT2 DEFAULT '1' NOT NULL CHECK (user_notify_pm >= 0), + user_notify boolean DEFAULT '0' NOT NULL CHECK (user_notify >= 0), + user_notify_pm boolean DEFAULT '1' NOT NULL CHECK (user_notify_pm >= 0), user_notify_type INT2 DEFAULT '0' NOT NULL, - user_allow_pm INT2 DEFAULT '1' NOT NULL CHECK (user_allow_pm >= 0), - user_allow_viewonline INT2 DEFAULT '1' NOT NULL CHECK (user_allow_viewonline >= 0), - user_allow_viewemail INT2 DEFAULT '1' NOT NULL CHECK (user_allow_viewemail >= 0), - user_allow_massemail INT2 DEFAULT '1' NOT NULL CHECK (user_allow_massemail >= 0), + user_allow_pm boolean DEFAULT '1' NOT NULL CHECK (user_allow_pm >= 0), + user_allow_viewonline boolean DEFAULT '1' NOT NULL CHECK (user_allow_viewonline >= 0), + user_allow_viewemail boolean DEFAULT '1' NOT NULL CHECK (user_allow_viewemail >= 0), + user_allow_massemail boolean DEFAULT '1' NOT NULL CHECK (user_allow_massemail >= 0), user_options INT4 DEFAULT '895' NOT NULL CHECK (user_options >= 0), user_avatar varchar(255) DEFAULT '' NOT NULL, user_avatar_type INT2 DEFAULT '0' NOT NULL, @@ -1261,11 +1189,12 @@ CREATE TABLE phpbb_words ( CREATE TABLE phpbb_zebra ( user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0), zebra_id INT4 DEFAULT '0' NOT NULL CHECK (zebra_id >= 0), - friend INT2 DEFAULT '0' NOT NULL CHECK (friend >= 0), - foe INT2 DEFAULT '0' NOT NULL CHECK (foe >= 0), + friend boolean DEFAULT '0' NOT NULL CHECK (friend >= 0), + foe boolean DEFAULT '0' NOT NULL CHECK (foe >= 0), PRIMARY KEY (user_id, zebra_id) ); +CREATE INDEX phpbb_zebra_zebra_user ON phpbb_zebra (zebra_id, user_id); COMMIT;
\ No newline at end of file diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index a3cea370e1..7fd1af8d35 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -483,12 +483,12 @@ INSERT INTO phpbb_users (user_type, group_id, username, username_clean, user_reg INSERT INTO phpbb_users (user_type, group_id, username, username_clean, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_from, user_icq, user_aim, user_yim, user_msnm, user_jabber, user_website, user_occ, user_interests, user_actkey, user_newpasswd) VALUES (3, 5, 'Admin', 'admin', 0, '21232f297a57a5a743894a0e4a801fc3', 'admin@yourdomain.com', 'en', 1, 1, 'AA0000', 1, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', '', '', '', '', '', '', '', '', ''); # -- Groups -INSERT INTO phpbb_groups (group_name, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid) VALUES ('GUESTS', 3, 0, '', 0, '', '', ''); -INSERT INTO phpbb_groups (group_name, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid) VALUES ('REGISTERED', 3, 0, '', 0, '', '', ''); -INSERT INTO phpbb_groups (group_name, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid) VALUES ('REGISTERED_COPPA', 3, 0, '', 0, '', '', ''); -INSERT INTO phpbb_groups (group_name, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid) VALUES ('GLOBAL_MODERATORS', 3, 0, '00AA00', 1, '', '', ''); -INSERT INTO phpbb_groups (group_name, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid) VALUES ('ADMINISTRATORS', 3, 1, 'AA0000', 1, '', '', ''); -INSERT INTO phpbb_groups (group_name, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid) VALUES ('BOTS', 3, 0, '9E8DA7', 0, '', '', ''); +INSERT INTO phpbb_groups (group_name, group_name_clean, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid) VALUES ('GUESTS', 'guests', 3, 0, '', 0, '', '', ''); +INSERT INTO phpbb_groups (group_name, group_name_clean, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid) VALUES ('REGISTERED', 'registered', 3, 0, '', 0, '', '', ''); +INSERT INTO phpbb_groups (group_name, group_name_clean, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid) VALUES ('REGISTERED_COPPA', 'registered_coppa', 3, 0, '', 0, '', '', ''); +INSERT INTO phpbb_groups (group_name, group_name_clean, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid) VALUES ('GLOBAL_MODERATORS', 'global_moderators' 3, 0, '00AA00', 1, '', '', ''); +INSERT INTO phpbb_groups (group_name, group_name_clean, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid) VALUES ('ADMINISTRATORS', 'administrators', 3, 1, 'AA0000', 1, '', '', ''); +INSERT INTO phpbb_groups (group_name, group_name_clean, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid) VALUES ('BOTS', 'bots', 3, 0, '9E8DA7', 0, '', '', ''); # -- User -> Group INSERT INTO phpbb_user_group (group_id, user_id, user_pending, group_leader) VALUES (1, 1, 0, 0); diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql index fa5884cc5b..2d4d78d6c1 100644 --- a/phpBB/install/schemas/sqlite_schema.sql +++ b/phpBB/install/schemas/sqlite_schema.sql @@ -152,6 +152,7 @@ CREATE TABLE phpbb_config ( ); CREATE INDEX phpbb_config_is_dynamic ON phpbb_config (is_dynamic); +CREATE INDEX phpbb_config_config_name ON phpbb_config (config_name); # Table: 'phpbb_confirm' CREATE TABLE phpbb_confirm ( @@ -289,6 +290,7 @@ CREATE TABLE phpbb_groups ( group_type tinyint(4) NOT NULL DEFAULT '1', group_founder_manage INTEGER UNSIGNED NOT NULL DEFAULT '0', group_name varchar(255) NOT NULL DEFAULT '', + group_name_clean varchar(255) NOT NULL DEFAULT '', group_desc text(65535) NOT NULL DEFAULT '', group_desc_bitfield varchar(255) NOT NULL DEFAULT '', group_desc_options INTEGER UNSIGNED NOT NULL DEFAULT '7', @@ -960,6 +962,7 @@ CREATE TABLE phpbb_zebra ( PRIMARY KEY (user_id, zebra_id) ); +CREATE INDEX phpbb_zebra_zebra_user ON phpbb_zebra (zebra_id, user_id); COMMIT;
\ No newline at end of file |