mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-30 13:30:25 +02:00
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission
* 'develop' of https://github.com/phpbb/phpbb3: (480 commits) [ticket/6723] Show info that message has been deleted before delivery [ticket/11385] Fix issue with migration module tool not getting extension module info [ticket/11386] Fix failing tests from constructor changes [ticket/11386] Fix circular reference error & serialize error [ticket/11386] Remove tests that check if finder cache is working [ticket/11386] Forgot to get the migration classes [ticket/11386] Update tests with new constructors for ext.manager/migrator [ticket/11386] Use finder to find migration files [ticket/11363] Fix to make get_module_infos get from all extensions [ticket/11381] Make finder able to search in all available extensions [ticket/11103] Revert whitespace changes [ticket/11103] Few more minor language things [ticket/11103] Don't call generate_board_url many times [ticket/11103] Case time in queries as an int [ticket/11103] Fix effectively installed check [ticket/11103] Remove padding from notifications for now. [ticket/11363] Fix a couple bugs and throw errors if the file not found [ticket/11372] Migrator should only check if effectively installed if not [ticket/11363] Load module info files for extensions too [ticket/11103] Notifications Migration file ... Conflicts: phpBB/includes/functions_posting.php phpBB/includes/mcp/mcp_queue.php phpBB/includes/search/fulltext_mysql.php phpBB/includes/search/fulltext_native.php phpBB/includes/search/fulltext_postgres.php phpBB/includes/search/fulltext_sphinx.php phpBB/install/database_update.php phpBB/styles/prosilver/template/ajax.js
This commit is contained in:
@@ -575,6 +575,21 @@ CREATE TABLE phpbb_moderator_cache (
|
||||
CREATE INDEX phpbb_moderator_cache_disp_idx ON phpbb_moderator_cache (display_on_index);
|
||||
CREATE INDEX phpbb_moderator_cache_forum_id ON phpbb_moderator_cache (forum_id);
|
||||
|
||||
/*
|
||||
Table: 'phpbb_migrations'
|
||||
*/
|
||||
CREATE TABLE phpbb_migrations (
|
||||
migration_name varchar(255) DEFAULT '' NOT NULL,
|
||||
migration_depends_on varchar(8000) DEFAULT '' NOT NULL,
|
||||
migration_schema_done INT2 DEFAULT '0' NOT NULL CHECK (migration_schema_done >= 0),
|
||||
migration_data_done INT2 DEFAULT '0' NOT NULL CHECK (migration_data_done >= 0),
|
||||
migration_data_state varchar(8000) DEFAULT '' NOT NULL,
|
||||
migration_start_time INT4 DEFAULT '0' NOT NULL CHECK (migration_start_time >= 0),
|
||||
migration_end_time INT4 DEFAULT '0' NOT NULL CHECK (migration_end_time >= 0),
|
||||
PRIMARY KEY (migration_name)
|
||||
);
|
||||
|
||||
|
||||
/*
|
||||
Table: 'phpbb_modules'
|
||||
*/
|
||||
@@ -599,6 +614,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'
|
||||
*/
|
||||
@@ -861,8 +906,11 @@ CREATE TABLE phpbb_reports (
|
||||
report_time INT4 DEFAULT '0' NOT NULL CHECK (report_time >= 0),
|
||||
report_text TEXT DEFAULT '' NOT NULL,
|
||||
reported_post_text TEXT DEFAULT '' NOT NULL,
|
||||
reported_post_bitfield varchar(255) DEFAULT '' NOT NULL,
|
||||
reported_post_uid varchar(8) DEFAULT '' NOT NULL,
|
||||
reported_post_bitfield varchar(255) DEFAULT '' NOT NULL,
|
||||
reported_post_enable_magic_url INT2 DEFAULT '1' NOT NULL CHECK (reported_post_enable_magic_url >= 0),
|
||||
reported_post_enable_smilies INT2 DEFAULT '1' NOT NULL CHECK (reported_post_enable_smilies >= 0),
|
||||
reported_post_enable_bbcode INT2 DEFAULT '1' NOT NULL CHECK (reported_post_enable_bbcode >= 0),
|
||||
PRIMARY KEY (report_id)
|
||||
);
|
||||
|
||||
@@ -1105,6 +1153,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