diff --git a/include/upgrader/streams/core.sig b/include/upgrader/streams/core.sig index 3ac67bf82846c663c880c6fc441e5e108e310989..19fc2a074f6659a91cc9a83bc9ce83334660c472 100644 --- a/include/upgrader/streams/core.sig +++ b/include/upgrader/streams/core.sig @@ -1 +1 @@ -f5692e24c7afba7ab6168dde0b3bb3c8 +4323a6a81c35efbf7722b7fc4e475440 diff --git a/include/upgrader/streams/core/f5692e24-4323a6a8.patch.sql b/include/upgrader/streams/core/f5692e24-4323a6a8.patch.sql new file mode 100644 index 0000000000000000000000000000000000000000..0a31b1a0eaad16672c31707c908dfe224226db87 --- /dev/null +++ b/include/upgrader/streams/core/f5692e24-4323a6a8.patch.sql @@ -0,0 +1,91 @@ +/** + * @version v1.8.2 + * @signature 4323a6a81c35efbf7722b7fc4e475440 + * @title Add client accounts table + * + */ + +ALTER TABLE `%TABLE_PREFIX%session` + CHANGE `user_id` `user_id` varchar(16) NOT NULL default '0' COMMENT 'osTicket staff/client ID'; + +ALTER TABLE `%TABLE_PREFIX%staff` + CHANGE `signature` `signature` text NOT NULL; + +ALTER TABLE `%TABLE_PREFIX%department` + CHANGE `dept_signature` `dept_signature` text NOT NULL; + +DROP TABLE IF EXISTS `%TABLE_PREFIX%email_account`; +CREATE TABLE `%TABLE_PREFIX%email_account` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(128) NOT NULL, + `active` tinyint(1) NOT NULL DEFAULT '1', + `protocol` varchar(64) NOT NULL DEFAULT '', + `host` varchar(128) NOT NULL DEFAULT '', + `port` int(11) NOT NULL, + `username` varchar(128) DEFAULT NULL, + `password` varchar(255) DEFAULT NULL, + `options` varchar(512) DEFAULT NULL, + `errors` int(11) unsigned DEFAULT NULL, + `created` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `updated` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP, + `lastconnect` timestamp NULL DEFAULT NULL, + `lasterror` timestamp NULL DEFAULT NULL, + PRIMARY KEY (`id`) +) DEFAULT CHARSET=utf8; + +ALTER TABLE `%TABLE_PREFIX%ticket_thread` + ADD `format` varchar(16) NOT NULL default 'html' AFTER `body`; + +ALTER TABLE `%TABLE_PREFIX%faq_category` + CHANGE `created` `created` datetime NOT NULL, + CHANGE `updated` `updated` datetime NOT NULL; + +ALTER TABLE `%TABLE_PREFIX%filter` + ADD `topic_id` int(11) unsigned NOT NULL default '0' AFTER `form_id`; + +ALTER TABLE `%TABLE_PREFIX%email` + ADD `topic_id` int(11) unsigned NOT NULL default '0' AFTER `dept_id`; + +ALTER TABLE `%TABLE_PREFIX%help_topic` + ADD `sort` int(10) unsigned NOT NULL default '0' AFTER `form_id`; + +-- Add `content_id` to the content table to allow for translations +RENAME TABLE `%TABLE_PREFIX%page` TO `%TABLE_PREFIX%content`; +ALTER TABLE `%TABLE_PREFIX%content` + CHANGE `type` `type` varchar(32) NOT NULL default 'other', + ADD `content_id` int(10) unsigned NOT NULL default 0; + +UPDATE `%TABLE_PREFIX%content` + SET `content_id` = `id`; + +DROP TABLE IF EXISTS `%TABLE_PREFIX%user_account`; +CREATE TABLE `%TABLE_PREFIX%user_account` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `user_id` int(10) unsigned NOT NULL, + `org_id` int(11) unsigned NOT NULL, + `status` int(11) unsigned NOT NULL DEFAULT '0', + `timezone_id` int(11) NOT NULL DEFAULT '0', + `dst` tinyint(1) NOT NULL DEFAULT '1', + `lang` varchar(16) DEFAULT NULL, + `username` varchar(64) DEFAULT NULL, + `passwd` varchar(128) CHARACTER SET ascii COLLATE ascii_bin DEFAULT NULL, + `backend` varchar(32) DEFAULT NULL, + `registered` timestamp NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + UNIQUE KEY `username` (`username`) +) DEFAULT CHARSET=utf8; + +DROP TABLE IF EXISTS `%TABLE_PREFIX%organization`; +CREATE TABLE `%TABLE_PREFIX%organization` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(128) NOT NULL DEFAULT '', + `staff_id` int(10) unsigned NOT NULL DEFAULT '0', + `created` timestamp NULL DEFAULT NULL, + `updated` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`) +) DEFAULT CHARSET=utf8; + +-- Finished with patch +UPDATE `%TABLE_PREFIX%config` + SET `value` = '4323a6a81c35efbf7722b7fc4e475440' + WHERE `key` = 'schema_signature' AND `namespace` = 'core'; diff --git a/setup/inc/streams/core/install-mysql.sql b/setup/inc/streams/core/install-mysql.sql index ded754d7c7f66c3e263b12a37c64cb80a7472c92..c15a946a6aa97c5e965a1ebebe6667f36b46b681 100644 --- a/setup/inc/streams/core/install-mysql.sql +++ b/setup/inc/streams/core/install-mysql.sql @@ -421,6 +421,16 @@ CREATE TABLE `%TABLE_PREFIX%help_topic` ( KEY `page_id` (`page_id`) ) DEFAULT CHARSET=utf8; +DROP TABLE IF EXISTS `%TABLE_PREFIX%organization`; +CREATE TABLE `%TABLE_PREFIX%organization` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(128) NOT NULL DEFAULT '', + `staff_id` int(10) unsigned NOT NULL DEFAULT '0', + `created` timestamp NULL DEFAULT NULL, + `updated` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`) +) DEFAULT CHARSET=utf8; + DROP TABLE IF EXISTS `%TABLE_PREFIX%canned_response`; CREATE TABLE `%TABLE_PREFIX%canned_response` ( `canned_id` int(10) unsigned NOT NULL auto_increment, @@ -711,7 +721,7 @@ INSERT INTO `%TABLE_PREFIX%timezone` (`id`, `offset`, `timezone`) VALUES -- pages CREATE TABLE IF NOT EXISTS `%TABLE_PREFIX%content` ( `id` int(10) unsigned NOT NULL auto_increment, - `content_id` int(10) unsigned NOT NULL, + `content_id` int(10) unsigned NOT NULL default '0', `isactive` tinyint(1) unsigned NOT NULL default '0', `type` varchar(32) NOT NULL default 'other', `name` varchar(255) NOT NULL, @@ -732,6 +742,7 @@ CREATE TABLE `%TABLE_PREFIX%plugin` ( `install_path` varchar(60) not null, `isphar` tinyint(1) not null default 0, `isactive` tinyint(1) not null default 0, + `version` varchar(64), `installed` datetime not null, primary key (`id`) ) DEFAULT CHARSET=utf8; @@ -769,6 +780,6 @@ CREATE TABLE `%TABLE_PREFIX%user_account` ( `passwd` varchar(128) CHARACTER SET ascii COLLATE ascii_bin DEFAULT NULL, `backend` varchar(32) DEFAULT NULL, `registered` timestamp NULL DEFAULT CURRENT_TIMESTAMP, - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), UNIQUE KEY `username` (`username`) ) DEFAULT CHARSET=utf8;