mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 22:28:51 +00:00
[ticket/9657] Break the schemas again to avoid merge conflicts
PHPBB3-9657
This commit is contained in:
parent
3495481b55
commit
3cee183dd4
7 changed files with 10 additions and 10 deletions
|
@ -918,8 +918,8 @@ CREATE TABLE phpbb_reports (
|
||||||
report_time INTEGER DEFAULT 0 NOT NULL,
|
report_time INTEGER DEFAULT 0 NOT NULL,
|
||||||
report_text BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
|
report_text BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
|
||||||
reported_post_text BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
|
reported_post_text BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
|
||||||
reported_post_uid VARCHAR(8) CHARACTER SET NONE DEFAULT '' NOT NULL,
|
reported_post_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
|
||||||
reported_post_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL
|
reported_post_uid VARCHAR(8) CHARACTER SET NONE DEFAULT '' NOT NULL
|
||||||
);;
|
);;
|
||||||
|
|
||||||
ALTER TABLE phpbb_reports ADD PRIMARY KEY (report_id);;
|
ALTER TABLE phpbb_reports ADD PRIMARY KEY (report_id);;
|
||||||
|
|
|
@ -1117,8 +1117,8 @@ CREATE TABLE [phpbb_reports] (
|
||||||
[report_time] [int] DEFAULT (0) NOT NULL ,
|
[report_time] [int] DEFAULT (0) NOT NULL ,
|
||||||
[report_text] [text] DEFAULT ('') NOT NULL ,
|
[report_text] [text] DEFAULT ('') NOT NULL ,
|
||||||
[reported_post_text] [text] DEFAULT ('') NOT NULL ,
|
[reported_post_text] [text] DEFAULT ('') NOT NULL ,
|
||||||
[reported_post_uid] [varchar] (8) DEFAULT ('') NOT NULL ,
|
[reported_post_bitfield] [varchar] (255) DEFAULT ('') NOT NULL ,
|
||||||
[reported_post_bitfield] [varchar] (255) DEFAULT ('') NOT NULL
|
[reported_post_uid] [varchar] (8) DEFAULT ('') NOT NULL
|
||||||
) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
|
) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
|
||||||
GO
|
GO
|
||||||
|
|
||||||
|
|
|
@ -655,8 +655,8 @@ CREATE TABLE phpbb_reports (
|
||||||
report_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
|
report_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
|
||||||
report_text mediumblob NOT NULL,
|
report_text mediumblob NOT NULL,
|
||||||
reported_post_text mediumblob NOT NULL,
|
reported_post_text mediumblob NOT NULL,
|
||||||
reported_post_uid varbinary(8) DEFAULT '' NOT NULL,
|
|
||||||
reported_post_bitfield varbinary(255) DEFAULT '' NOT NULL,
|
reported_post_bitfield varbinary(255) DEFAULT '' NOT NULL,
|
||||||
|
reported_post_uid varbinary(8) DEFAULT '' NOT NULL,
|
||||||
PRIMARY KEY (report_id),
|
PRIMARY KEY (report_id),
|
||||||
KEY post_id (post_id),
|
KEY post_id (post_id),
|
||||||
KEY pm_id (pm_id)
|
KEY pm_id (pm_id)
|
||||||
|
|
|
@ -655,8 +655,8 @@ CREATE TABLE phpbb_reports (
|
||||||
report_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
|
report_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
|
||||||
report_text mediumtext NOT NULL,
|
report_text mediumtext NOT NULL,
|
||||||
reported_post_text mediumtext NOT NULL,
|
reported_post_text mediumtext NOT NULL,
|
||||||
reported_post_uid varchar(8) DEFAULT '' NOT NULL,
|
|
||||||
reported_post_bitfield varchar(255) DEFAULT '' NOT NULL,
|
reported_post_bitfield varchar(255) DEFAULT '' NOT NULL,
|
||||||
|
reported_post_uid varchar(8) DEFAULT '' NOT NULL,
|
||||||
PRIMARY KEY (report_id),
|
PRIMARY KEY (report_id),
|
||||||
KEY post_id (post_id),
|
KEY post_id (post_id),
|
||||||
KEY pm_id (pm_id)
|
KEY pm_id (pm_id)
|
||||||
|
|
|
@ -1222,8 +1222,8 @@ CREATE TABLE phpbb_reports (
|
||||||
report_time number(11) DEFAULT '0' NOT NULL,
|
report_time number(11) DEFAULT '0' NOT NULL,
|
||||||
report_text clob DEFAULT '' ,
|
report_text clob DEFAULT '' ,
|
||||||
reported_post_text clob DEFAULT '' ,
|
reported_post_text clob DEFAULT '' ,
|
||||||
reported_post_uid varchar2(8) DEFAULT '' ,
|
|
||||||
reported_post_bitfield varchar2(255) DEFAULT '' ,
|
reported_post_bitfield varchar2(255) DEFAULT '' ,
|
||||||
|
reported_post_uid varchar2(8) DEFAULT '' ,
|
||||||
CONSTRAINT pk_phpbb_reports PRIMARY KEY (report_id)
|
CONSTRAINT pk_phpbb_reports PRIMARY KEY (report_id)
|
||||||
)
|
)
|
||||||
/
|
/
|
||||||
|
|
|
@ -861,8 +861,8 @@ CREATE TABLE phpbb_reports (
|
||||||
report_time INT4 DEFAULT '0' NOT NULL CHECK (report_time >= 0),
|
report_time INT4 DEFAULT '0' NOT NULL CHECK (report_time >= 0),
|
||||||
report_text TEXT DEFAULT '' NOT NULL,
|
report_text TEXT DEFAULT '' NOT NULL,
|
||||||
reported_post_text TEXT DEFAULT '' NOT NULL,
|
reported_post_text TEXT DEFAULT '' NOT NULL,
|
||||||
reported_post_uid varchar(8) DEFAULT '' NOT NULL,
|
|
||||||
reported_post_bitfield varchar(255) DEFAULT '' NOT NULL,
|
reported_post_bitfield varchar(255) DEFAULT '' NOT NULL,
|
||||||
|
reported_post_uid varchar(8) DEFAULT '' NOT NULL,
|
||||||
PRIMARY KEY (report_id)
|
PRIMARY KEY (report_id)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -636,8 +636,8 @@ CREATE TABLE phpbb_reports (
|
||||||
report_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
|
report_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
|
||||||
report_text mediumtext(16777215) NOT NULL DEFAULT '',
|
report_text mediumtext(16777215) NOT NULL DEFAULT '',
|
||||||
reported_post_text mediumtext(16777215) NOT NULL DEFAULT '',
|
reported_post_text mediumtext(16777215) NOT NULL DEFAULT '',
|
||||||
reported_post_uid varchar(8) NOT NULL DEFAULT '',
|
reported_post_bitfield varchar(255) NOT NULL DEFAULT '',
|
||||||
reported_post_bitfield varchar(255) NOT NULL DEFAULT ''
|
reported_post_uid varchar(8) NOT NULL DEFAULT ''
|
||||||
);
|
);
|
||||||
|
|
||||||
CREATE INDEX phpbb_reports_post_id ON phpbb_reports (post_id);
|
CREATE INDEX phpbb_reports_post_id ON phpbb_reports (post_id);
|
||||||
|
|
Loading…
Add table
Reference in a new issue