From d44d9d25dcfff0ac46635a72149779f9032b38ca Mon Sep 17 00:00:00 2001 From: Megan Watson Date: Tue, 5 May 2009 08:37:03 +0200 Subject: [PATCH] Added the 3.6.* upgrades to the install data. Changed the 3.6 upgrade directory to 3.6.0 --- sql/mysql/install/data.sql | 7 +++++-- sql/mysql/upgrade/3.6.0/download_queue.sql | 23 +++++++++++++++++++++++ sql/mysql/upgrade/3.6.0/ldap_config_setting.sql | 2 ++ sql/mysql/upgrade/3.6/download_queue.sql | 23 ----------------------- sql/mysql/upgrade/3.6/ldap_config_setting.sql | 2 -- 5 files changed, 30 insertions(+), 27 deletions(-) create mode 100644 sql/mysql/upgrade/3.6.0/download_queue.sql create mode 100644 sql/mysql/upgrade/3.6.0/ldap_config_setting.sql delete mode 100644 sql/mysql/upgrade/3.6/download_queue.sql delete mode 100644 sql/mysql/upgrade/3.6/ldap_config_setting.sql diff --git a/sql/mysql/install/data.sql b/sql/mysql/install/data.sql index 9ed8af9..8c20c94 100644 --- a/sql/mysql/install/data.sql +++ b/sql/mysql/install/data.sql @@ -1753,8 +1753,11 @@ INSERT INTO `upgrades` VALUES (214,'func*3.5.4a*0*removeOldFilesAndFolders354a','Remove old files and folders that are no longer needed.','2008-10-01 00:00:00',1,'upgrade*3.5.4a*99*upgrade3.5.4a'), (215,'func*3.5.4a*0*removeOldFilesAndFolders354a1','Remove old files and folders that are no longer needed.','2008-10-01 00:00:00',1,'upgrade*3.5.4a*99*upgrade3.5.4a'), (216,'upgrade*3.5.4a*99*upgrade3.5.4a','Upgrade from version 3.5.4 to 3.5.4a','2008-12-01 00:00:00',1,'upgrade*3.5.4a*99*upgrade3.5.4a'), -(217,'upgrade*3.6.0*99*upgrade3.6.0','Upgrade from version 3.5.4a to 3.6.0','2009-01-01 00:00:00',1,'upgrade*3.6.0*99*upgrade3.6.0'), -(218,'upgrade*3.6.1*99*upgrade3.6.1','Upgrade from version 3.6.0 to 3.6.1','2009-04-01 00:00:00',1,'upgrade*3.6.1*99*upgrade3.6.1'); +(217, 'sql*3.6*0*3.6.0/ldap_config_setting.sql', 'Database upgrade to version 3.6: Ldap config setting','2009-01-01 00:00:00',1,'upgrade*3.6.0*99*upgrade3.6.0'), +(218, 'sql*3.6*0*3.6.0/download_queue.sql', 'Database upgrade to version 3.6: Download queue','2009-01-01 00:00:00',1,'upgrade*3.6.0*99*upgrade3.6.0'), +(219,'upgrade*3.6.0*99*upgrade3.6.0','Upgrade from version 3.5.4a to 3.6.0','2009-01-01 00:00:00',1,'upgrade*3.6.0*99*upgrade3.6.0'), +(220, 'sql*3.6.1*0*3.6.1/search_ranking.sql', 'Database upgrade to version 3.6.1: Search ranking','2009-04-01 00:00:00',1,'upgrade*3.6.1*99*upgrade3.6.1'), +(221,'upgrade*3.6.1*99*upgrade3.6.1','Upgrade from version 3.6.0 to 3.6.1','2009-04-01 00:00:00',1,'upgrade*3.6.1*99*upgrade3.6.1'); /*!40000 ALTER TABLE `upgrades` ENABLE KEYS */; UNLOCK TABLES; diff --git a/sql/mysql/upgrade/3.6.0/download_queue.sql b/sql/mysql/upgrade/3.6.0/download_queue.sql new file mode 100644 index 0000000..bfec58d --- /dev/null +++ b/sql/mysql/upgrade/3.6.0/download_queue.sql @@ -0,0 +1,23 @@ +-- +-- Table structure for table `download_queue` +-- + +CREATE TABLE `download_queue` ( + `code` char(16) NOT NULL, + `folder_id` int(11) NOT NULL, + `object_id` int(11) NOT NULL, + `object_type` enum('document', 'folder') NOT NULL default 'folder', + `user_id` int(11) NOT NULL, + `date_added` timestamp NOT NULL default CURRENT_TIMESTAMP, + `status` tinyint(4) NOT NULL default 0, + `errors` mediumtext, + INDEX (`code`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +INSERT INTO `config_settings` (group_name, display_name, description, item, value, default_value, type, options, can_edit) +VALUES ('export', 'Use External Zip Binary', 'Utilises the external zip binary for compressing archives. The default is to use the PEAR archive class.', 'useBinary', 'default', 'false', 'boolean', NULL, 1), +('export', 'Use Bulk Download Queue', 'The bulk download can be large and can prevent normal browsing. The download queue performs the bulk downloads in +the background.', 'useDownloadQueue', 'default', 'true', 'boolean', NULL, 1); + +INSERT INTO `scheduler_tasks` (task, script_url, frequency, run_time, status) +VALUES ('Bulk Download Queue','bin/ajaxtasks/downloadTask.php','30secs','2007-10-01','system'); \ No newline at end of file diff --git a/sql/mysql/upgrade/3.6.0/ldap_config_setting.sql b/sql/mysql/upgrade/3.6.0/ldap_config_setting.sql new file mode 100644 index 0000000..bc1ae62 --- /dev/null +++ b/sql/mysql/upgrade/3.6.0/ldap_config_setting.sql @@ -0,0 +1,2 @@ +INSERT INTO `config_settings` (group_name, display_name, description, item, value, default_value, type, options, can_edit) +VALUES ('ldapAuthentication', 'Allow Moving Users in LDAP/AD', 'Moving users around within the LDAP or Active Directory structure will cause failed logins for these users. When this setting is enabled, a failed login will trigger a search for the user using their sAMAccountName setting and update their authentication details.', 'enableLdapUpdate', 'default', 'false', 'boolean', NULL, 1); \ No newline at end of file diff --git a/sql/mysql/upgrade/3.6/download_queue.sql b/sql/mysql/upgrade/3.6/download_queue.sql deleted file mode 100644 index bfec58d..0000000 --- a/sql/mysql/upgrade/3.6/download_queue.sql +++ /dev/null @@ -1,23 +0,0 @@ --- --- Table structure for table `download_queue` --- - -CREATE TABLE `download_queue` ( - `code` char(16) NOT NULL, - `folder_id` int(11) NOT NULL, - `object_id` int(11) NOT NULL, - `object_type` enum('document', 'folder') NOT NULL default 'folder', - `user_id` int(11) NOT NULL, - `date_added` timestamp NOT NULL default CURRENT_TIMESTAMP, - `status` tinyint(4) NOT NULL default 0, - `errors` mediumtext, - INDEX (`code`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -INSERT INTO `config_settings` (group_name, display_name, description, item, value, default_value, type, options, can_edit) -VALUES ('export', 'Use External Zip Binary', 'Utilises the external zip binary for compressing archives. The default is to use the PEAR archive class.', 'useBinary', 'default', 'false', 'boolean', NULL, 1), -('export', 'Use Bulk Download Queue', 'The bulk download can be large and can prevent normal browsing. The download queue performs the bulk downloads in -the background.', 'useDownloadQueue', 'default', 'true', 'boolean', NULL, 1); - -INSERT INTO `scheduler_tasks` (task, script_url, frequency, run_time, status) -VALUES ('Bulk Download Queue','bin/ajaxtasks/downloadTask.php','30secs','2007-10-01','system'); \ No newline at end of file diff --git a/sql/mysql/upgrade/3.6/ldap_config_setting.sql b/sql/mysql/upgrade/3.6/ldap_config_setting.sql deleted file mode 100644 index bc1ae62..0000000 --- a/sql/mysql/upgrade/3.6/ldap_config_setting.sql +++ /dev/null @@ -1,2 +0,0 @@ -INSERT INTO `config_settings` (group_name, display_name, description, item, value, default_value, type, options, can_edit) -VALUES ('ldapAuthentication', 'Allow Moving Users in LDAP/AD', 'Moving users around within the LDAP or Active Directory structure will cause failed logins for these users. When this setting is enabled, a failed login will trigger a search for the user using their sAMAccountName setting and update their authentication details.', 'enableLdapUpdate', 'default', 'false', 'boolean', NULL, 1); \ No newline at end of file -- libgit2 0.21.4