Skip to content

Commit 6e2f910

Browse files
author
Till Brehm
committed
Merge branch 'ispconfig-3p3-beta-release-prepare' into 'develop'
Create upd_0101.sql file to prepare for ISPConfig 3.3 release. See merge request ispconfig/ispconfig3!2003
2 parents df1798b + 5c29fd8 commit 6e2f910

File tree

2 files changed

+22
-23
lines changed

2 files changed

+22
-23
lines changed
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
ALTER TABLE `web_database_user` ADD `database_password_sha2` varchar(70) DEFAULT NULL AFTER `database_password`;
2+
ALTER TABLE `web_database_user` ADD `database_password_postgres` varchar(255) DEFAULT NULL AFTER `database_password_mongo`;
3+
ALTER TABLE `client` ADD `limit_database_postgresql` INT NOT NULL DEFAULT '-1' AFTER `limit_database`;
4+
ALTER TABLE `client_template` ADD `limit_database_postgresql` INT NOT NULL DEFAULT '-1' AFTER `limit_database`;
5+
ALTER TABLE `server_php` ADD `php_cli_binary` varchar(255) DEFAULT NULL AFTER `php_fpm_socket_dir`;
6+
ALTER TABLE `server_php` ADD `php_jk_section` varchar(255) DEFAULT NULL AFTER `php_cli_binary`;
7+
ALTER TABLE `mail_domain` ADD `local_delivery` enum('n','y') NOT NULL DEFAULT 'y' AFTER `active`;
8+
ALTER TABLE `sys_remoteaction` CHANGE `action_type` `action_type` VARCHAR(64) NOT NULL;
9+
CREATE TABLE IF NOT EXISTS `sys_message` (
10+
`message_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
11+
`sys_userid` int(11) unsigned NOT NULL DEFAULT 0,
12+
`sys_groupid` int(11) unsigned NOT NULL DEFAULT 0,
13+
`sys_perm_user` VARCHAR(5) DEFAULT 'r',
14+
`sys_perm_group` VARCHAR(5) DEFAULT 'r',
15+
`sys_perm_other` VARCHAR(5) DEFAULT '',
16+
`message_state` enum('info','warning','error') NOT NULL DEFAULT 'info',
17+
`message_date` datetime NULL DEFAULT NULL,
18+
`message_ack` enum('y','n') NOT NULL DEFAULT 'n',
19+
`relation` varchar(255) NULL DEFAULT NULL,
20+
`message` TEXT DEFAULT NULL,
21+
PRIMARY KEY (`message_id`)
22+
) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;
Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +0,0 @@
1-
ALTER TABLE `web_database_user` ADD `database_password_sha2` varchar(70) DEFAULT NULL AFTER `database_password`;
2-
ALTER TABLE `web_database_user` ADD `database_password_postgres` varchar(255) DEFAULT NULL AFTER `database_password_mongo`;
3-
ALTER TABLE `client` ADD `limit_database_postgresql` INT NOT NULL DEFAULT '-1' AFTER `limit_database`;
4-
ALTER TABLE `client_template` ADD `limit_database_postgresql` INT NOT NULL DEFAULT '-1' AFTER `limit_database`;
5-
ALTER TABLE `server_php` ADD `php_cli_binary` varchar(255) DEFAULT NULL AFTER `php_fpm_socket_dir`;
6-
ALTER TABLE `server_php` ADD `php_jk_section` varchar(255) DEFAULT NULL AFTER `php_cli_binary`;
7-
ALTER TABLE `mail_domain` ADD `local_delivery` enum('n','y') NOT NULL DEFAULT 'y' AFTER `active`;
8-
ALTER TABLE `sys_remoteaction` CHANGE `action_type` `action_type` VARCHAR(64) NOT NULL;
9-
10-
CREATE TABLE IF NOT EXISTS `sys_message` (
11-
`message_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
12-
`sys_userid` int(11) unsigned NOT NULL DEFAULT 0,
13-
`sys_groupid` int(11) unsigned NOT NULL DEFAULT 0,
14-
`sys_perm_user` VARCHAR(5) DEFAULT 'r',
15-
`sys_perm_group` VARCHAR(5) DEFAULT 'r',
16-
`sys_perm_other` VARCHAR(5) DEFAULT '',
17-
`message_state` enum('info','warning','error') NOT NULL DEFAULT 'info',
18-
`message_date` datetime NULL DEFAULT NULL,
19-
`message_ack` enum('y','n') NOT NULL DEFAULT 'n',
20-
`relation` varchar(255) NULL DEFAULT NULL,
21-
`message` TEXT DEFAULT NULL,
22-
PRIMARY KEY (`message_id`)
23-
) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;

0 commit comments

Comments
 (0)