mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-05 00:07:44 +02:00
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars
Conflicts: phpBB/install/database_update.php
This commit is contained in:
@@ -611,6 +611,36 @@ CREATE INDEX phpbb_modules_left_right_id ON phpbb_modules (left_id, right_id);
|
||||
CREATE INDEX phpbb_modules_module_enabled ON phpbb_modules (module_enabled);
|
||||
CREATE INDEX phpbb_modules_class_left_id ON phpbb_modules (module_class, left_id);
|
||||
|
||||
/*
|
||||
Table: 'phpbb_notification_types'
|
||||
*/
|
||||
CREATE TABLE phpbb_notification_types (
|
||||
notification_type varchar(255) DEFAULT '' NOT NULL,
|
||||
notification_type_enabled INT2 DEFAULT '1' NOT NULL CHECK (notification_type_enabled >= 0),
|
||||
PRIMARY KEY (notification_type, notification_type_enabled)
|
||||
);
|
||||
|
||||
|
||||
/*
|
||||
Table: 'phpbb_notifications'
|
||||
*/
|
||||
CREATE SEQUENCE phpbb_notifications_seq;
|
||||
|
||||
CREATE TABLE phpbb_notifications (
|
||||
notification_id INT4 DEFAULT nextval('phpbb_notifications_seq'),
|
||||
item_type varchar(255) DEFAULT '' NOT NULL,
|
||||
item_id INT4 DEFAULT '0' NOT NULL CHECK (item_id >= 0),
|
||||
item_parent_id INT4 DEFAULT '0' NOT NULL CHECK (item_parent_id >= 0),
|
||||
user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
|
||||
notification_read INT2 DEFAULT '0' NOT NULL CHECK (notification_read >= 0),
|
||||
notification_time INT4 DEFAULT '1' NOT NULL CHECK (notification_time >= 0),
|
||||
notification_data varchar(4000) DEFAULT '' NOT NULL,
|
||||
PRIMARY KEY (notification_id)
|
||||
);
|
||||
|
||||
CREATE INDEX phpbb_notifications_item_ident ON phpbb_notifications (item_type, item_id);
|
||||
CREATE INDEX phpbb_notifications_user ON phpbb_notifications (user_id, notification_read);
|
||||
|
||||
/*
|
||||
Table: 'phpbb_poll_options'
|
||||
*/
|
||||
@@ -1113,6 +1143,18 @@ CREATE INDEX phpbb_topics_watch_topic_id ON phpbb_topics_watch (topic_id);
|
||||
CREATE INDEX phpbb_topics_watch_user_id ON phpbb_topics_watch (user_id);
|
||||
CREATE INDEX phpbb_topics_watch_notify_stat ON phpbb_topics_watch (notify_status);
|
||||
|
||||
/*
|
||||
Table: 'phpbb_user_notifications'
|
||||
*/
|
||||
CREATE TABLE phpbb_user_notifications (
|
||||
item_type varchar(255) DEFAULT '' NOT NULL,
|
||||
item_id INT4 DEFAULT '0' NOT NULL CHECK (item_id >= 0),
|
||||
user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
|
||||
method varchar(255) DEFAULT '' NOT NULL,
|
||||
notify INT2 DEFAULT '1' NOT NULL CHECK (notify >= 0)
|
||||
);
|
||||
|
||||
|
||||
/*
|
||||
Table: 'phpbb_user_group'
|
||||
*/
|
||||
|
Reference in New Issue
Block a user