mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 22:10:45 +02:00
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission
* 'develop' of https://github.com/phpbb/phpbb3: [ticket/11408] user_jabber instead of jabber [ticket/10202] Rename method names _all() to _array(). [ticket/10202] Add migration file for config_db_text. [ticket/10202] Upgrade TEXT to the bigger MTEXT. [ticket/10202] Improve method documentation. [ticket/10202] SQL escape the table name. [ticket/10202] Add $this->db->sql_freeresult($result) to SELECT queries. [ticket/10202] Define phpbb_config_db_text as a service. [ticket/10202] Add tests for phpbb_config_db_text. [ticket/10202] Adjust method names to guidelines. [ticket/10202] Add database schema for phpbb_config_db_text. [ticket/10202] Implementation of config options with arbitrary length values. [ticket/11166] Add ajaxify support to normal ACP confirm_box() [ticket/11166] Fix several custom confirm templates in prosilver [ticket/11166] Add caption to AJAX confirm box default template [ticket/11166] Fix typo in comment [ticket/11166] Use provided custom templates on AJAX confirm box
This commit is contained in:
@@ -222,6 +222,15 @@ ALTER TABLE phpbb_config ADD PRIMARY KEY (config_name);;
|
||||
|
||||
CREATE INDEX phpbb_config_is_dynamic ON phpbb_config(is_dynamic);;
|
||||
|
||||
# Table: 'phpbb_config_text'
|
||||
CREATE TABLE phpbb_config_text (
|
||||
config_name VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
|
||||
config_value BLOB SUB_TYPE TEXT CHARACTER SET NONE DEFAULT '' NOT NULL
|
||||
);;
|
||||
|
||||
ALTER TABLE phpbb_config_text ADD PRIMARY KEY (config_name);;
|
||||
|
||||
|
||||
# Table: 'phpbb_confirm'
|
||||
CREATE TABLE phpbb_confirm (
|
||||
confirm_id CHAR(32) CHARACTER SET NONE DEFAULT '' NOT NULL,
|
||||
|
@@ -293,6 +293,23 @@ CREATE INDEX [is_dynamic] ON [phpbb_config]([is_dynamic]) ON [PRIMARY]
|
||||
GO
|
||||
|
||||
|
||||
/*
|
||||
Table: 'phpbb_config_text'
|
||||
*/
|
||||
CREATE TABLE [phpbb_config_text] (
|
||||
[config_name] [varchar] (255) DEFAULT ('') NOT NULL ,
|
||||
[config_value] [text] DEFAULT ('') NOT NULL
|
||||
) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
|
||||
GO
|
||||
|
||||
ALTER TABLE [phpbb_config_text] WITH NOCHECK ADD
|
||||
CONSTRAINT [PK_phpbb_config_text] PRIMARY KEY CLUSTERED
|
||||
(
|
||||
[config_name]
|
||||
) ON [PRIMARY]
|
||||
GO
|
||||
|
||||
|
||||
/*
|
||||
Table: 'phpbb_confirm'
|
||||
*/
|
||||
|
@@ -157,6 +157,14 @@ CREATE TABLE phpbb_config (
|
||||
);
|
||||
|
||||
|
||||
# Table: 'phpbb_config_text'
|
||||
CREATE TABLE phpbb_config_text (
|
||||
config_name varbinary(255) DEFAULT '' NOT NULL,
|
||||
config_value mediumblob NOT NULL,
|
||||
PRIMARY KEY (config_name)
|
||||
);
|
||||
|
||||
|
||||
# Table: 'phpbb_confirm'
|
||||
CREATE TABLE phpbb_confirm (
|
||||
confirm_id binary(32) DEFAULT '' NOT NULL,
|
||||
|
@@ -157,6 +157,14 @@ CREATE TABLE phpbb_config (
|
||||
) CHARACTER SET `utf8` COLLATE `utf8_bin`;
|
||||
|
||||
|
||||
# Table: 'phpbb_config_text'
|
||||
CREATE TABLE phpbb_config_text (
|
||||
config_name varchar(255) DEFAULT '' NOT NULL,
|
||||
config_value mediumtext NOT NULL,
|
||||
PRIMARY KEY (config_name)
|
||||
) CHARACTER SET `utf8` COLLATE `utf8_bin`;
|
||||
|
||||
|
||||
# Table: 'phpbb_confirm'
|
||||
CREATE TABLE phpbb_confirm (
|
||||
confirm_id char(32) DEFAULT '' NOT NULL,
|
||||
|
@@ -331,6 +331,17 @@ CREATE TABLE phpbb_config (
|
||||
CREATE INDEX phpbb_config_is_dynamic ON phpbb_config (is_dynamic)
|
||||
/
|
||||
|
||||
/*
|
||||
Table: 'phpbb_config_text'
|
||||
*/
|
||||
CREATE TABLE phpbb_config_text (
|
||||
config_name varchar2(255) DEFAULT '' ,
|
||||
config_value clob DEFAULT '' ,
|
||||
CONSTRAINT pk_phpbb_config_text PRIMARY KEY (config_name)
|
||||
)
|
||||
/
|
||||
|
||||
|
||||
/*
|
||||
Table: 'phpbb_confirm'
|
||||
*/
|
||||
|
@@ -269,6 +269,16 @@ CREATE TABLE phpbb_config (
|
||||
|
||||
CREATE INDEX phpbb_config_is_dynamic ON phpbb_config (is_dynamic);
|
||||
|
||||
/*
|
||||
Table: 'phpbb_config_text'
|
||||
*/
|
||||
CREATE TABLE phpbb_config_text (
|
||||
config_name varchar(255) DEFAULT '' NOT NULL,
|
||||
config_value TEXT DEFAULT '' NOT NULL,
|
||||
PRIMARY KEY (config_name)
|
||||
);
|
||||
|
||||
|
||||
/*
|
||||
Table: 'phpbb_confirm'
|
||||
*/
|
||||
|
@@ -154,6 +154,14 @@ CREATE TABLE phpbb_config (
|
||||
|
||||
CREATE INDEX phpbb_config_is_dynamic ON phpbb_config (is_dynamic);
|
||||
|
||||
# Table: 'phpbb_config_text'
|
||||
CREATE TABLE phpbb_config_text (
|
||||
config_name varchar(255) NOT NULL DEFAULT '',
|
||||
config_value mediumtext(16777215) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (config_name)
|
||||
);
|
||||
|
||||
|
||||
# Table: 'phpbb_confirm'
|
||||
CREATE TABLE phpbb_confirm (
|
||||
confirm_id char(32) NOT NULL DEFAULT '',
|
||||
|
Reference in New Issue
Block a user