diff --git a/include/upgrader/patches/435c62c3-6007d45b.cleanup.sql b/include/upgrader/patches/435c62c3-6007d45b.cleanup.sql new file mode 100644 index 0000000000000000000000000000000000000000..75192e141510d052fda52b338170ea7b8bc52e4c --- /dev/null +++ b/include/upgrader/patches/435c62c3-6007d45b.cleanup.sql @@ -0,0 +1 @@ +ALTER TABLE `%TABLE_PREFIX%groups` DROP `dept_access`; diff --git a/include/upgrader/patches/435c62c3-6007d45b.patch.sql b/include/upgrader/patches/435c62c3-6007d45b.patch.sql new file mode 100644 index 0000000000000000000000000000000000000000..0b16b85f69bf25111db44f062c442f2721058323 --- /dev/null +++ b/include/upgrader/patches/435c62c3-6007d45b.patch.sql @@ -0,0 +1,28 @@ +/** + * Move dept_access from group table to group_dept_access table. + * + * @version 1.7-rc1 Dept_Access + */ + +-- Group department access table +CREATE TABLE `%TABLE_PREFIX%group_dept_access` ( + `group_id` int(10) unsigned NOT NULL default '0', + `dept_id` int(10) unsigned NOT NULL default '0', + PRIMARY KEY (`group_id`,`dept_id`) +) ENGINE=MyISAM; + +-- Extend membership to groups +ALTER TABLE `%TABLE_PREFIX%department` + ADD `group_membership` tinyint( 1 ) unsigned NOT NULL DEFAULT '0' AFTER `ispublic`; + +-- Fix teams create date +UPDATE `%TABLE_PREFIX%team` + SET `created`=IFNULL(`created`, IFNULL(`updated`, NOW())), `updated`=IFNULL(`updated`, NOW()); + +-- Fix groups dates... +UPDATE `%TABLE_PREFIX%groups` + SET `created`=IFNULL(`created`, IFNULL(`updated`, NOW())), `updated`=IFNULL(`updated`, NOW()); + +-- Finished with patch +UPDATE `%TABLE_PREFIX%config` + SET `schema_signature`='6007d45b580c6ac0206514dbed0f28a6'; diff --git a/main.inc.php b/main.inc.php index 1de9c91a3185d6a740cf9832069be71c0a29a805..fb720f7cc1bf49710229d7bd0075d9571091c18d 100644 --- a/main.inc.php +++ b/main.inc.php @@ -63,7 +63,7 @@ #Current version && schema signature (Changes from version to version) define('THIS_VERSION','1.7-DPR4'); //Shown on admin panel - define('SCHEMA_SIGNATURE','435c62c3b23795529bcfae7e7371d82e'); //MD5 signature of the db schema. (used to trigger upgrades) + define('SCHEMA_SIGNATURE','6007d45b580c6ac0206514dbed0f28a6'); //MD5 signature of the db schema. (used to trigger upgrades) #load config info $configfile=''; @@ -136,6 +136,7 @@ define('DEPT_TABLE',TABLE_PREFIX.'department'); define('TOPIC_TABLE',TABLE_PREFIX.'help_topic'); define('GROUP_TABLE',TABLE_PREFIX.'groups'); + define('GROUP_DEPT_TABLE', TABLE_PREFIX.'group_dept_access'); define('TEAM_TABLE',TABLE_PREFIX.'team'); define('TEAM_MEMBER_TABLE',TABLE_PREFIX.'team_member');