mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-13 04:04:12 +02:00
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars
Conflicts: phpBB/config/services.yml
This commit is contained in:
@@ -798,6 +798,22 @@ CREATE INDEX phpbb_moderator_cache_disp_idx ON phpbb_moderator_cache (display_on
|
||||
CREATE INDEX phpbb_moderator_cache_forum_id ON phpbb_moderator_cache (forum_id)
|
||||
/
|
||||
|
||||
/*
|
||||
Table: 'phpbb_migrations'
|
||||
*/
|
||||
CREATE TABLE phpbb_migrations (
|
||||
migration_name varchar2(255) DEFAULT '' ,
|
||||
migration_depends_on clob DEFAULT '' ,
|
||||
migration_schema_done number(1) DEFAULT '0' NOT NULL,
|
||||
migration_data_done number(1) DEFAULT '0' NOT NULL,
|
||||
migration_data_state clob DEFAULT '' ,
|
||||
migration_start_time number(11) DEFAULT '0' NOT NULL,
|
||||
migration_end_time number(11) DEFAULT '0' NOT NULL,
|
||||
CONSTRAINT pk_phpbb_migrations PRIMARY KEY (migration_name)
|
||||
)
|
||||
/
|
||||
|
||||
|
||||
/*
|
||||
Table: 'phpbb_modules'
|
||||
*/
|
||||
@@ -1216,8 +1232,11 @@ CREATE TABLE phpbb_reports (
|
||||
report_time number(11) DEFAULT '0' NOT NULL,
|
||||
report_text clob DEFAULT '' ,
|
||||
reported_post_text clob DEFAULT '' ,
|
||||
reported_post_bitfield varchar2(255) DEFAULT '' ,
|
||||
reported_post_uid varchar2(8) DEFAULT '' ,
|
||||
reported_post_bitfield varchar2(255) DEFAULT '' ,
|
||||
reported_post_enable_magic_url number(1) DEFAULT '1' NOT NULL,
|
||||
reported_post_enable_smilies number(1) DEFAULT '1' NOT NULL,
|
||||
reported_post_enable_bbcode number(1) DEFAULT '1' NOT NULL,
|
||||
CONSTRAINT pk_phpbb_reports PRIMARY KEY (report_id)
|
||||
)
|
||||
/
|
||||
|
Reference in New Issue
Block a user